add rateOptions and shuffle rpn expressions around to work with query se...

...rvice