diff --git a/src/components/Map/VMap.global.vue b/src/components/Map/VMap.global.vue
index 039b579..9b84c14 100644
--- a/src/components/Map/VMap.global.vue
+++ b/src/components/Map/VMap.global.vue
@@ -173,21 +173,11 @@ onMounted(() => {
       emit('add:layer', convertGeoJSONWithPointRadius(e.layer))
     })
 
-    /*     drawnItems.on('pm:change', (e) => {
-      emit('geojson', getDrawItemsInGeoJson())
-      emit('edit:layer', convertGeoJSONWithPointRadius(e.layer))
-    }) */
-
     drawnItems.on('pm:edit', (e) => {
       emit('geojson', getDrawItemsInGeoJson())
       emit('edit:layer', convertGeoJSONWithPointRadius(e.layer))
     })
 
-    drawnItems.on('pm:drag', (e) => {
-      emit('geojson', getDrawItemsInGeoJson())
-      emit('drag:layer', convertGeoJSONWithPointRadius(e.layer))
-    })
-
     mapObject.on('pm:drawstart', (e) => {
       clearDrawLayers()
       emit('draw:start', e)
diff --git a/src/modules/otus/components/Search/OtuSearch.vue b/src/modules/otus/components/Search/OtuSearch.vue
index d0ff4f6..ce1841d 100644
--- a/src/modules/otus/components/Search/OtuSearch.vue
+++ b/src/modules/otus/components/Search/OtuSearch.vue
@@ -6,7 +6,6 @@
     <VSpinner v-if="isLoading" />
     <SearchBar
       :label="otu.object_tag"
-      @search="loadOTUs"
       @close="() => emit('close')"
     />
     <div class="relative">
@@ -18,10 +17,9 @@
         :disable-zoom="!!shapes"
         :zoom-bounds="6"
         :geojson="shapes"
-        @add:layer="setLayer"
-        @edit:layer="setLayer"
-        @drag:layer="setLayer"
-        @draw:start="() => (geojson = {})"
+        @add:layer="(layer) => loadOTUs(JSON.stringify(layer.geometry))"
+        @edit:layer="(layer) => loadOTUs(JSON.stringify(layer.geometry))"
+        @drag:layer="(layer) => loadOTUs(JSON.stringify(layer.geometry))"
         :zoom="4"
       />
       <div
@@ -62,7 +60,6 @@ const props = defineProps({
 
 const root = ref()
 const emit = defineEmits(['close'])
-const geoJson = ref({})
 const mapRef = ref(null)
 const list = ref([])
 const isTableVisible = ref(false)
@@ -86,13 +83,9 @@ const handleKeyboard = ({ key }) => {
   }
 }
 
-function setLayer(geojsonLayer) {
-  geoJson.value = JSON.stringify(geojsonLayer.geometry)
-}
-
-function loadOTUs() {
+function loadOTUs(geojson) {
   const payload = {
-    geo_json: geoJson.value,
+    geo_json: geojson,
     taxon_name_id: [props.otu.taxon_name_id],
     descendants: true
   }
diff --git a/src/modules/otus/components/Search/SearchBar.vue b/src/modules/otus/components/Search/SearchBar.vue
index 785e2d0..9cbd671 100644
--- a/src/modules/otus/components/Search/SearchBar.vue
+++ b/src/modules/otus/components/Search/SearchBar.vue
@@ -3,12 +3,6 @@
     class="bottom-0 w-screen bg-base-foreground z-[1000] left-0 p-4 text-sm flex flex-row justify-between align-middle box-border border-b border-base-muted"
   >
     <div>
-      <VButton
-        primary
-        @click="() => emit('search')"
-      >
-        Search
-      </VButton>
       <span
         class="ml-2"
         v-html="label"
@@ -22,7 +16,7 @@
 </template>
 
 <script setup>
-const emit = defineEmits(['search', 'close'])
+const emit = defineEmits(['close'])
 
 const props = defineProps({
   label: {