Location-aware price-per-unit, minor add shelf tag fixes