Added the "-- No Value --" logic.