added ability to use hidden facets
brought up to coder standards
solve merge conflict