Fix to avoid a display name element being empty
Trim a last char of a bucket if that was /