enahancements for options query