consolidate empty suffix handling