fixes for changing City