Fix missing city with social login
Improved parsing T&P