Moved check and changed to check on facet element instead of class