diff --git a/Classes/Controller/AjaxController.php b/Classes/Controller/AjaxController.php
index 1ce77e5..30b9dc8 100644
--- a/Classes/Controller/AjaxController.php
+++ b/Classes/Controller/AjaxController.php
@@ -238,9 +238,12 @@ public function ajaxEidAction() {
         // fetching correct language for locallang labels
         $siteConfiguration = $this->request1->getAttribute('site')->getConfiguration();
         for ($i = 0; $i < count($siteConfiguration['languages']); $i++) {
-            if ($siteConfiguration['languages'][$i]['typo3Language'] == $requestArguments['language']) {
-                $this->language = $siteConfiguration['languages'][$i]['typo3Language'];
+           if ($siteConfiguration['languages'][$i]['languageId'] == $requestArguments['language']) {
+                $this->locale = $siteConfiguration['languages'][$i]['locale'];
+                $this->language = explode('_', $this->locale)[0];
+//                $this->languageService = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create($this->language);
             }
+ 
         }
         
         $this->_GP['categories'] = '';
diff --git a/Classes/Domain/Repository/AddressRepository.php b/Classes/Domain/Repository/AddressRepository.php
index 69f611f..1bb93ac 100644
--- a/Classes/Domain/Repository/AddressRepository.php
+++ b/Classes/Domain/Repository/AddressRepository.php
@@ -135,6 +135,7 @@ public function findLocationsInRadius($latLon, $radius, $categories, $storagePid
 //				echo $result[$i]['name'] . ' CheckOk = ' . $checkOk . ' $j= ' .$j . '<' . $page * $limit . '&&' . $j . '<=' . intval(($page + 1) * $limit) . '<br />';
 				if (!($arrayOfCategories)) $checkOk = 1;
 
+                $newResult = [];
 				if ($checkOk && ($j >  $page * $limit && $j <= intval(($page + 1) * $limit))) {
 					$newResult[] = $result[$i];
 				}
diff --git a/ext_emconf.php b/ext_emconf.php
index 5f180ff..0dd1389 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -14,7 +14,7 @@
   'title' => 'MyLeaflet',
   'description' => 'Leaflet / OpenStreetMap for tt_address data with radial search and categories. No registration and no API-keys necessary.',
   'category' => 'plugin',
-  'version' => '2.0.0',
+  'version' => '2.0.1',
   'state' => 'beta',
   'uploadfolder' => false,
   'clearcacheonload' => false,