Make the search include shorter words
Use a simpler search/store