Ajay | #4151 | Added or_other for single_select