fix search and subs