further fixes for empty values