Clean up searcher class.
Return proper entity serializations.
Clean up.
Switch index format of entities to be closer to REST.