Filter fix

I changed the way it was filtering from trying to query to the database
to using a Data View and filtering it locally. I left your code josh if
you like what i have done you can delete it.