query page enhancements