fixed issue with dashes in ids