[WIP] Search Changes 1 - Ditch ElasticUtils