Improved facets check and fixed small issue with edit link