Allow a grid id to end with a dash and a number and have it not affect column DnD reordering.

Replaced spaces with tabs.