pushing enhancements for simple query