Filter performance on environment

This works, but you need to add the tags by hand in django admin for now

Included minor refactor to more consistently filter in filters.py