continue to improve search wording - this is ugly - needs tests!