Fixing minor issues with tag data loading