Rename query to fom_query