FAIMS-359 - change the logic to preserve user selection on the vocabulary