Added minimal code for search (included placeholder the for ESH)