Add Query and QueryBuilder page