Fix FAQs search bug
Merge origin/master