Going to merge this as is, since I think this will need revisiting anyway if/when we add more filters.