changed: order of the query (for better performance)