Fix search conditions in extra.