Added possibility to discard options using empty values