Fixes for the Search and Irrelevant Terms