Changes to allow 2D tables to be selected and displayed by name, rather than just by integer locationID