tightened up query parameters