Update $extras array keys doesn't contain 'extra_' then substr($key , 6) is useless -refs #7072