changed query, comments