Fixes search term bugs