completed query page functionalities from UI side as well