Closes #12 compatibility with the search bar