diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index ec0b33e..920451b 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -142,9 +142,8 @@ final class BackendController extends Controller
 
         $mapperQuery = ProfileMapper::get()
             ->with('account')
-            ->with('image')
-            ->with('location')
-            ->with('contactElements');
+            ->with('account/locations')
+            ->with('image');
 
         /** @var \Modules\Profile\Models\Profile $profile */
         $profile = $request->getData('for') !== null
diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index 773776d..b2efb5e 100755
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -46,7 +46,7 @@
     <div class="box" id="<?= $this->getId(); ?>-tags" data-limit="0" data-active="true">
         <template id="<?= $this->getId(); ?>-tagTemplate">
             <span class="tag red" data-tpl-value="/id" data-value="" data-uuid="" data-name="<?= $this->printHtml($this->name); ?>">
-                <i class="fa fa-times"></i>
+                <i class="fa fa-times close"></i>
                 <span style="display: none;" data-name="type_prefix" data-tpl-value="/type_prefix" data-value=""></span>
                 <span data-tpl-text="/id" data-name="id" data-tpl-value="/id" data-value=""></span>
                 <span data-tpl-text="/name/0" data-tpl-value="/name/0" data-value=""></span>
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index 10012bb..0b5b0f6 100755
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -101,7 +101,7 @@ echo $this->getData('nav')->render();
                                     <th><?= $this->getHtml('Address'); ?>
                                     <td>
                                 <?php
-                                    $locations = $profile->getLocation();
+                                    $locations = $profile->account->getLocations();
                                     if (empty($locations)) :
                                 ?>
                                 <tr>
@@ -125,7 +125,7 @@ echo $this->getData('nav')->render();
                                     <th><?= $this->getHtml('Contact'); ?>
                                     <td>
                                     <?php
-                                    $contacts = $profile->getContactElements();
+                                    $contacts = $profile->account->getContacts();
                                     if (empty($contacts)) :
                                 ?>
                                 <tr>