rickshaw works, fix query