Cleaning up query options UI
2183 (JIRA)  remove stale from query options
Fix linting issue
initial linking with paginate
Improved key support