Changed behaviour of displaying empty choice