Fixed bug where distance / location in tags overridding real tag