Minor Tweak to check if there is a value before setting the clear option