Handle empty flags better