fix query:flodl/3 - account for more than 2 params#13

orotemo wants to merge 4 commits intoerlware:mastererlware/uri:masterfrom

orotemo:masterorotemo/uri:masterCopy head branch name to clipboard