fixes search interrupt display bug + other cleanups