Search match fix