Search works again
Finish es stuff