Mostly fixed

search fields still wonky…