clean up, search fix