Fix some things from no-more-kws and search-list-last yelp-cheetah changes