Search key fixes