fix search and app mode