MLDS-308 MLDS-455 Improve generated street example