- extracting buildQueryString from viewQuery
- using buildQueryString with viewKeysQuery
- renaming 'params' 'query'