* hack the latest migration to fix psql issue * add new migration to fix previous migration * adjust query