FS-5613 --resolve only alphanumeric plus - _ . are now allowed