Close #38 and add custom search functionality