Stopped calling the base classes BaseQuery and BaseFilter, using Query and Filter instead. Will later want to create a different BaseQuery that will handle sorting, faceting, etc.