Fixed omitted conflicts in search plugin and tests