fix search and screen pop bug