Remove old search + minor fixes for Hanna.