2 files changed, 6 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 04265963a..8d0b5ab50 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -4,6 +4,7 @@ use base 'FixMyStreet::Cobrand::Base';
 use strict;
 use warnings;
 use FixMyStreet;
+use Encode;
 use URI;
 use Digest::MD5 qw(md5_hex);
 
@@ -647,7 +648,9 @@ sub get_report_stats { return 0; }
 sub get_council_sender { return 'Email' };
 
 sub example_places {
-    return FixMyStreet->config('EXAMPLE_PLACES') || [ 'High Street', 'Main Street' ];
+    my $e = FixMyStreet->config('EXAMPLE_PLACES') || [ 'High Street', 'Main Street' ];
+    $e = [ map { Encode::decode('UTF-8', $_) } @$e ];
+    return $e;
 }
 
 sub process_extras {}
diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm
index ba939b443..197b2b1e7 100644
--- a/perllib/FixMyStreet/Geocode/OSM.pm
+++ b/perllib/FixMyStreet/Geocode/OSM.pm
@@ -15,7 +15,7 @@ use Digest::MD5 qw(md5_hex);
 use Encode;
 use File::Slurp;
 use File::Path ();
-use LWP::Simple;
+use LWP::Simple qw($ua);
 use Memcached;
 use XML::Simple;
 
@@ -49,6 +49,7 @@ sub string {
     if (-s $cache_file) {
         $js = File::Slurp::read_file($cache_file);
     } else {
+        $ua->timeout(15);
         $js = LWP::Simple::get($url);
         $js = encode_utf8($js) if utf8::is_utf8($js);
         File::Path::mkpath($cache_dir);