Fix: #556: Allow a grid id to have a dash-number prefix

This fix strips the grid id prefix from the dndtype value so it does not cause problems in dndtype parser.  I also added some test cases that include grid ids with dash-number suffixes.