some more design changes! in query fragment