Some search cleanup. Now interactive