CITOM_OPTIONS: fixed searching and adding conflict