Tidy up
First version of ES Search handler