diff --git a/static/js/weather.app.js b/static/js/weather.app.js
index 7b7525e..aed31f2 100644
--- a/static/js/weather.app.js
+++ b/static/js/weather.app.js
@@ -253,7 +253,6 @@ function updateForecast(forecast){
   $("#cityName").text(city.name);
   $("#cityCode").text(city.cp);
   var data = forecast.forecast.METEOCONCEPT.forecast;
-  console.log(data);
 
   // Present day
   var today = data[0];
@@ -281,14 +280,6 @@ function updateForecast(forecast){
   }
 }
 
-// Refresh button handler
-$("#refreshButton").on("click", function(){
-  // Starts Refresh button's spinning animation
-  $("#refreshButton").html("<i class='fa fa-refresh fa-spin fa-fw'></i>");
-  getWeatherData();
-  getForecastData();
-});
-
 // Applies the following format to date: WeekDay, Month Day, Year
 function getFormattedDate(date){
   var options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
@@ -304,10 +295,4 @@ function toCamelCase(str) {
     }
   );
   return arr.join(" ");
-}
-
-
-// Converts to Celcius
-function toCelcius(val){
-  return Math.round((val - 32) * (5/9));
 }
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 0aa296c..746540e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -169,7 +169,7 @@
     </div>
     <script>
         $("body").on('change', '#input_city', function() {
-            var query = $('#input_city').val();
+            var query = $('#input_city').val().replaceAll(' ', '-');
             $.ajax({
               url:"/search",
               method:"POST",
@@ -179,14 +179,25 @@
                   var res  = data.cities.METEOCONCEPT;
                   var html = '<option value="#">Selectionner ville</option>';
                   for(var count = 0; count < res.length; count++) {
-                      html += '<option value="'+res[count].insee+'">'+res[count].name+'</option>';
+                      var cp = res[count].cp.toString();
+                      if(cp.length < 5){
+                          cp = "0" + cp
+                      }
+                      html += '<option value="'+res[count].insee+'">'+res[count].name+' ('+cp+')</option>';
                   }
 
                   if(res.length === 1){
+                      sessionStorage.setItem('insee', res[0].insee);
                       getWeatherData(res[0].insee);
                       getForecastData(res[0].insee);
                       $('#wrapper').removeAttr('style');
-                      $('#select_city').html('<option value="'+res[0].insee+'">'+res[0].name+'</option>');
+                      var cp = res[0].cp.toString();
+                      if(cp.length < 5){
+                          cp = "0" + cp
+                      }
+                      $('#select_city').html('<option value="'+res[0].insee+'">'+res[0].name+'('+cp+')</option>');
+                  } else if (res.length === 0){
+                      $('#select_city').html('<option value="#">Aucun ville trouvée</option>');
                   } else{
                       $('#select_city').html(html);
                   }
@@ -196,10 +207,20 @@
 
         $("body").on('change', '#select_city', function(){
             var insee = $('#select_city').val();
+            sessionStorage.setItem('insee', insee);
             getWeatherData(insee);
             getForecastData(insee);
             $('#wrapper').removeAttr('style');
         });
+
+
+        // Refresh button handler
+        $("#refreshButton").on("click", function(){
+          // Starts Refresh button's spinning animation
+          $("#refreshButton").html("<i class='fa fa-refresh fa-spin fa-fw'></i>");
+          getWeatherData(sessionStorage.getItem('insee'));
+          getForecastData(sessionStorage.getItem('insee'));
+        });
     </script>
 </body>
 </html>
\ No newline at end of file