Improved query executed for layout page choices.