Various improvements/fixes related to facets