UCBG-416: Added null values to drop downs