Remove a ton of boilerplate by moving list query building into base class