Better handling of blank options