Remove obsolete matrix reference
Rename search hash key - remove matrix reference