Change variable naming
Add facets to type filtering, Add place filtering