Added generic query page