Refactoring soledad querier to use mixins