Optimal non-linear tariffs, Price-cap and territorial uniformity