Fixing search pre-rendering and grouping by vocab