- Added new query logic for all pages