First fix for issue #52 - distinguishing different locations in preview table
Additional work on issue #52 - distinguishing different locations in full data table