elastic search support
cleaner search code
little cleaner again
typo