Fixed merge issue with trip form
Updated schema file to move indexed fields to front of tables