Make map=X match even when there is subvault information.