Story #63428054: Better ux for unmap