Fixed a couple of bugs in retrieving the place name.