Fixed search order. Will optimize later
Merge branch 'fix-accordion-search'