Wip/h3nk3 search functionality