Actually fix Mousetrap and search