Instead of filtering on the server like this, can we make this part of the query? If you need help with this, lemme know.