Work on speeding up grouped search results