Preserve HQ/HD suffixes