diff --git a/template/module/journey_step.pug b/template/module/journey_step.pug
index c3498c1..f8b5652 100644
--- a/template/module/journey_step.pug
+++ b/template/module/journey_step.pug
@@ -40,15 +40,15 @@ div(v-for="(e, idx) in journey.data.main", :key="idx")
               track-by="place_id",
               placeholder="Type to search",
               open-direction="bottom",
-              :options="query.nominatim",
+              :options="query.res",
               :searchable="true",
-              :loading="querying.hotel",
+              :loading="query.act && query.type=='hotel'",
               :internal-search="false",
               :clear-on-select="false",
               :options-limit="50",
               :limit="1",
               :max-height="600",
-              @search-change="debounceSearch.hotel"
+              @search-change="search_hotel"
             )
           .row.text-center
             div
@@ -60,15 +60,15 @@ div(v-for="(e, idx) in journey.data.main", :key="idx")
               placeholder="Type to search",
               open-direction="bottom",
               :multiple="true",
-              :options="query.nominatim",
+              :options="query.res",
               :searchable="true",
-              :loading="querying.food",
+              :loading="query.act && query.type == 'restaurant'",
               :internal-search="false",
               :clear-on-select="false",
               :options-limit="50",
               :limit="10",
               :max-height="600",
-              @search-change="debounceSearch.restaurants"
+              @search-change="search_restaurant"
             )
           .row.text-center
             div
@@ -80,15 +80,15 @@ div(v-for="(e, idx) in journey.data.main", :key="idx")
               placeholder="Type to search",
               open-direction="bottom",
               :multiple="true",
-              :options="query.nominatim",
+              :options="query.res",
               :searchable="true",
-              :loading="querying.place",
+              :loading="query.act && query.type=='place'",
               :internal-search="false",
               :clear-on-select="false",
               :options-limit="50",
               :limit="10",
               :max-height="600",
-              @search-change="debounceSearch.places"
+              @search-change="search_place"
             )
           .row.text-center
             div