Better handling for the placename