Improved logic for FAQs and subcategory view (#566)