Organize query2