Removing search rebuilding