did the same for other queries as well