Refactored code, use multiple selectoors for facet list