Few fixes in query data