Refactor category search tree partials and fix empty li elements
Merge branch 'bugfix-categories' into experimental-reduced-layout