Changed street expansion method, so 'St John St' is expanded to 'St John Street' and not 'Street John Street'