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