Change inclusion syntax in select facet

- Rename helper function so it's more obvious what it's for
- use "x" unless n in the template as it's less prone to breaking when being edited