Improved search clearing mapping.