Added more to search functionality closes #57