Fix the saving of custom categorical value even if its out of bounds of the valid values

BMS-131

Reviewer: Aldrin Batac