- Remove passing of **kw to query, since it would break Listbox
pagination
- Avoid code duplication
- Fix indentation