Merge "Fix 4 PHPCS warnings in Searchupdate.php"