all_query fixed