diff --git a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
index 1cdd972..7ea6d1c 100644
--- a/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/base.tpl.php
@@ -2,7 +2,7 @@
 <button type="button" data-action='[
     {
         "listener": "click", "action": [
-            {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn"},
+            {"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->printHtml($this->getId()); ?>"},
             {"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
             {"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
             {"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
diff --git a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
index b03228b..243ed26 100644
--- a/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
+++ b/Theme/Backend/Components/AccountGroupSelector/popup.tpl.php
@@ -13,88 +13,84 @@
             <div class="tab-content">
                 <input type="radio" id="c-tab-1" name="tabular-2" checked>
                 <div class="tab">
-                    <form id="fAccSelector"  method="GET" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/accgrp'); ?>">
-                        <table class="layout wf-100">
-                            <tbody>
-                            <tr><td colspan="2"><label for="iSearchAcc">Search</label>
-                            <tr><td><input type="text" id="iSearchAcc" name="receiver-search" data-action='[
-                                {
-                                    "listener": "keyup", "action": [
-                                        {"key": 1, "type": "utils.timer", "id": "iSearchAcc", "delay": 500, "resets": true},
-                                        {"key": 2, "type": "dom.table.clear", "id": "acc-table"},
-                                        {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchAcc}", "method": "GET", "request_type": "json"},
-                                        {"key": 4, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
-                                    ]
-                                }
-                            ]' autocomplete="off"><td>
-                            <tr><td colspan="2">
-                                <table id="acc-table" class="table">
-                                    <thead>
-                                        <tr>
-                                            <th data-name="id">ID
-                                            <th data-name="name">Name
-                                            <th data-name="address">Address
-                                            <th data-name="city">City
-                                            <th data-name="zip">Zip
-                                            <th data-name="country">Country
-                                            <!-- todo: get data from tr in action and pass it to next actions, or make new request based on table cell? -->
-                                    <tbody data-action='[
-                                        {
-                                            "key": 1, "listener": "click", "selector": "#acc-table tbody tr", "action": [
-                                                {"key": 1, "type": "dom.getvalue", "base": "self", "selector": ""},
-                                                {"key": 2, "type": "dom.setvalue", "overwrite": false, "selector": "#<?= $this->printHtml($this->getId()); ?>-idlist", "value": "{0/id}", "data": ""},
-                                                {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#<?= $this->printHtml($this->getId()); ?>-taglist", "value": "<span id=\"<?= $this->printHtml($this->getId()); ?>-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name/0}, {0/name/1}<span>", "data": ""},
-                                                {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#<?= $this->printHtml($this->getId()); ?>", "value": "", "data": ""}
-                                            ]
-                                        }
-                                    ]'>
-                                    <tfoot>
-                                </table>
-                            <tr><td colspan="2"><button type="button" data-action='[
+                    <table class="layout wf-100">
+                    <tbody>
+                        <tr><td colspan="2"><label for="iSearchAcc">Search</label>
+                        <tr><td colspan="2"><input type="text" id="iSearchAcc" name="receiver-search" data-action='[
+                            {
+                                "listener": "keyup", "action": [
+                                    {"key": 1, "type": "utils.timer", "id": "iSearchAcc", "delay": 500, "resets": true},
+                                    {"key": 2, "type": "dom.table.clear", "id": "acc-table"},
+                                    {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchAcc}", "method": "GET", "request_type": "json"},
+                                    {"key": 4, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+                                ]
+                            }
+                        ]' autocomplete="off">
+                        <tr><td colspan="2">
+                            <table id="acc-table" class="table">
+                                <thead>
+                                    <tr>
+                                        <th data-name="id">ID
+                                        <th data-name="name">Name
+                                        <th data-name="address">Address
+                                        <th data-name="city">City
+                                        <th data-name="zip">Zip
+                                        <th data-name="country">Country
+                                        <!-- todo: get data from tr in action and pass it to next actions, or make new request based on table cell? -->
+                                <tbody data-action='[
                                     {
-                                        "listener": "click", "action": [
-                                            {"key": 1, "type": "dom.remove", "selector": "#acc-grp", "aniOut": "fadeOut"}
+                                        "key": 1, "listener": "click", "selector": "#acc-table tbody tr", "action": [
+                                        {"key": 1, "type": "dom.getvalue", "base": "self", "selector": ""},
+                                        {"key": 2, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-idlist", "value": "{0/id}", "data": ""},
+                                        {"key": 3, "type": "dom.setvalue", "overwrite": false, "selector": "#{$id}-taglist", "value": "<span id=\"{$id}-taglist-{0/id}\" class=\"tag red\" data-id=\"{0/id}\"><i class=\"fa fa-times\"></i> {0/name/0}, {0/name/1}<span>", "data": ""},
+                                        {"key": 4, "type": "dom.setvalue", "overwrite": true, "selector": "#{$id}", "value": "", "data": ""}
                                         ]
                                     }
-                                ]'><?= $this->getHtml('Close', 'Admin') ?></button>
-                        </table>
-                    </form>
+                                ]'>
+                                <tfoot>
+                            </table>
+                        <tr><td colspan="2"><button type="button" data-action='[
+                                {
+                                    "listener": "click", "action": [
+                                        {"key": 1, "type": "dom.remove", "selector": "#acc-grp", "aniOut": "fadeOut"}
+                                    ]
+                                }
+                            ]'><?= $this->getHtml('Close', 'Admin') ?></button>
+                    </table>
                 </div>
                 <input type="radio" id="c-tab-2" name="tabular-2">
                 <div class="tab">
-                <form id="fGrpSelector"  method="GET" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/accgrp'); ?>">
-                        <table class="layout wf-100">
-                            <tbody>
-                            <tr><td colspan="2"><label for="iSearchGrp">Search</label>
-                            <tr><td><input type="text" id="iSearchGrp" name="receiver-search" data-action='[
+                    <table class="layout wf-100">
+                        <tbody>
+                        <tr><td colspan="2"><label for="iSearchGrp">Search</label>
+                        <tr><td><input type="text" id="iSearchGrp" name="receiver-search" data-action='[
+                            {
+                                "listener": "keyup", "action": [
+                                    {"key": 1, "type": "utils.timer", "id": "iSearchGrp", "delay": 500, "resets": true},
+                                    {"key": 2, "type": "dom.table.clear", "id": "grp-table"},
+                                    {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchGrp}", "method": "GET", "request_type": "json"},
+                                    {"key": 4, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+                                ]
+                            }
+                        ]' autocomplete="off"><td>
+                        <tr><td colspan="2">
+                            <table id="grp-table" class="table">
+                                <thead>
+                                    <tr>
+                                        <th data-name="id">ID
+                                        <th data-name="name">Name
+                                        <th data-name="parent">Parent
+                                <tbody>
+                                <tfoot>
+                            </table>
+                        <tr><td colspan="2"><button type="button" data-action='[
                                 {
-                                    "listener": "keyup", "action": [
-                                        {"key": 1, "type": "utils.timer", "id": "iSearchGrp", "delay": 500, "resets": true},
-                                        {"key": 2, "type": "dom.table.clear", "id": "grp-table"},
-                                        {"key": 3, "type": "message.request", "uri": "{/base}/{/lang}/api/admin/find/account?search={#iSearchGrp}", "method": "GET", "request_type": "json"},
-                                        {"key": 4, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
+                                    "listener": "click", "action": [
+                                        {"key": 1, "type": "dom.remove", "selector": "#acc-grp", "aniOut": "fadeOut"}
                                     ]
                                 }
-                            ]' autocomplete="off"><td>
-                            <tr><td colspan="2">
-                                <table id="grp-table" class="table">
-                                    <thead>
-                                        <tr>
-                                            <th data-name="id">ID
-                                            <th data-name="name">Name
-                                            <th data-name="parent">Parent
-                                    <tbody>
-                                    <tfoot>
-                                </table>
-                            <tr><td colspan="2"><button type="button" data-action='[
-                                    {
-                                        "listener": "click", "action": [
-                                            {"key": 1, "type": "dom.remove", "selector": "#acc-grp", "aniOut": "fadeOut"}
-                                        ]
-                                    }
-                                ]'><?= $this->getHtml('Close', 'Admin') ?></button>
-                        </table>
-                    </form>
+                            ]'><?= $this->getHtml('Close', 'Admin') ?></button>
+                    </table>
                 </div>
             </div>
         </div>