diff --git a/pwa/src/app/pages/collection/collection.page.html b/pwa/src/app/pages/collection/collection.page.html
index a1803fde..b8f6a7a8 100644
--- a/pwa/src/app/pages/collection/collection.page.html
+++ b/pwa/src/app/pages/collection/collection.page.html
@@ -119,234 +119,244 @@ <h3>{{ subheader | translate }}&nbsp;</h3>
           </ion-row>
         </ion-grid>
 
-        <!-- ACTION BUTTONS -->
-        <ion-grid *ngIf="is_crud && actions.length > 0" class="actions-grid">
-          <ion-row>
-            <ion-col size="12">
-              <span *ngFor="let item of actions; let ac = index">
-                <ion-button *ngIf="item.enabled; actionhide" (click)="doAction(ac)">
-                  <ion-icon *ngIf="item.one_click"
-                    [name]="item?.icon ? item.icon : 'play-forward-circle-outline'"></ion-icon>
-                  <ion-icon *ngIf="!item.one_click" [name]="item?.icon ? item.icon : 'play-circle-outline'"></ion-icon>
-                  {{ item.title | translate }}
-                </ion-button>
-                <ng-template #actionhide></ng-template>
-              </span>
-            </ion-col>
-          </ion-row>
-        </ion-grid>
-
-        <ion-grid *ngIf="flashcards_?.length > 0" class="ion-no-padding">
-          <ion-row>
-            <ion-col size="12" class="schema-flashcard-container">
-              <div *ngFor="let item of flashcards_" (click)="doFlashcard(item)">{{
-                item.view.title | translate }}<br /><span>{{ item.count }}</span></div>
-            </ion-col>
-          </ion-row>
-        </ion-grid>
-
         <!-- CRUD GRID SECTION -->
-        <table *ngIf="is_initialized && data.length > 0" class="data-table">
-          <tr>
-            <th>&nbsp;</th>
-            <th>
-              <ion-checkbox [(ngModel)]="multicheckbox" (ionChange)="SwitchSelectData($event.detail.checked)" mode="md">
-              </ion-checkbox>
-            </th>
-            <th *ngFor="let item of properties_ | keyvalue : orderByIndex">
-              <div (click)="doSetSearch(item.key)">
-                {{ item.value.title }}
-                <span *ngIf="searched && searched[item.key] && searched[item.key].f" class="danger">[F]</span>
-                <br />
-                <ion-text color="primary">{{ item.key }}</ion-text>
-              </div>
-              <div *ngIf="searched && searched[item.key]?.actived && !searched[item.key].setmode" class="search-box">
-                <div class="searched-title">{{ item.value.title }}&nbsp;&nbsp;</div>
-                <ion-button color="light" size="small" (click)="setSort(item.key, 1)">
-                  <ion-icon name="arrow-down"></ion-icon>
-                </ion-button>
-                <ion-button color="light" size="small" (click)="setSort(item.key, -1)">
-                  <ion-icon name="arrow-up"></ion-icon>
-                </ion-button>
-                <ion-button color="light" size="small" (click)="setCopy(item.key)">
-                  <ion-icon *ngIf="!is_key_copied && !is_key_copying" name="copy-outline"></ion-icon>
-                  <ion-icon *ngIf="is_key_copied" name="checkmark"></ion-icon>
-                  <ion-icon *ngIf="is_key_copying" name="hourglass-outline"></ion-icon>
-                </ion-button>
-                <br />
-                <div *ngIf="item.value.bsonType!='bool'" class="search-ops">
-                  <ion-button [color]="searched[item.key].op == 'contains' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'contains')">
-                    in
-                  </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'eq' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'eq')">
-                    =
+        <div *ngIf="is_initialized && data.length > 0; else notinit">
+          <!-- ACTION BUTTONS -->
+          <ion-grid *ngIf="is_crud && actions.length > 0" class="actions-grid">
+            <ion-row>
+              <ion-col size="12">
+                <span *ngFor="let item of actions; let ac = index">
+                  <ion-button *ngIf="item.enabled; actionhide" (click)="doAction(ac)">
+                    <ion-icon *ngIf="item.one_click"
+                      [name]="item?.icon ? item.icon : 'play-forward-circle-outline'"></ion-icon>
+                    <ion-icon *ngIf="!item.one_click"
+                      [name]="item?.icon ? item.icon : 'play-circle-outline'"></ion-icon>
+                    {{ item.title | translate }}
                   </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'ne' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'ne')">
-                    &ne;
-                  </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'gte' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'gte')">
-                    &ge;
-                  </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'lte' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'lte')">
-                    &le;
+                  <ng-template #actionhide></ng-template>
+                </span>
+              </ion-col>
+            </ion-row>
+          </ion-grid>
+          <ion-grid *ngIf="flashcards_?.length > 0" class="ion-no-padding">
+            <ion-row>
+              <ion-col size="12" class="schema-flashcard-container">
+                <div *ngFor="let item of flashcards_" (click)="doFlashcard(item)">{{
+                  item.view.title | translate }}<br /><span>{{ item.count }}</span></div>
+              </ion-col>
+            </ion-row>
+          </ion-grid>
+          <table class="data-table">
+            <tr>
+              <th>&nbsp;</th>
+              <th>
+                <ion-checkbox [(ngModel)]="multicheckbox" (ionChange)="SwitchSelectData($event.detail.checked)"
+                  mode="md">
+                </ion-checkbox>
+              </th>
+              <th *ngFor="let item of properties_ | keyvalue : orderByIndex">
+                <div (click)="doSetSearch(item.key)">
+                  {{ item.value.title }}
+                  <span *ngIf="searched && searched[item.key] && searched[item.key].f" class="danger">[F]</span>
+                  <br />
+                  <ion-text color="primary">{{ item.key }}</ion-text>
+                </div>
+                <div *ngIf="searched && searched[item.key]?.actived && !searched[item.key].setmode" class="search-box">
+                  <div class="searched-title">{{ item.value.title }}&nbsp;&nbsp;</div>
+                  <ion-button color="light" size="small" (click)="setSort(item.key, 1)">
+                    <ion-icon name="arrow-down"></ion-icon>
                   </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'null' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'null')">
-                    &#9723;
+                  <ion-button color="light" size="small" (click)="setSort(item.key, -1)">
+                    <ion-icon name="arrow-up"></ion-icon>
                   </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'nnull' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'nnull')">
-                    &#9724;
+                  <ion-button color="light" size="small" (click)="setCopy(item.key)">
+                    <ion-icon *ngIf="!is_key_copied && !is_key_copying" name="copy-outline"></ion-icon>
+                    <ion-icon *ngIf="is_key_copied" name="checkmark"></ion-icon>
+                    <ion-icon *ngIf="is_key_copying" name="hourglass-outline"></ion-icon>
                   </ion-button>
-                </div>
-                <div *ngIf="item.value.bsonType=='bool'">
-                  <ion-button [color]="searched[item.key].op == 'true' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'true')">
-                    {{ 'True' | translate }}
+                  <br />
+                  <div *ngIf="item.value.bsonType!='bool'" class="search-ops">
+                    <ion-button [color]="searched[item.key].op == 'contains' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'contains')">
+                      in
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'eq' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'eq')">
+                      =
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'ne' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'ne')">
+                      &ne;
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'gte' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'gte')">
+                      &ge;
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'lte' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'lte')">
+                      &le;
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'null' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'null')">
+                      &#9723;
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'nnull' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'nnull')">
+                      &#9724;
+                    </ion-button>
+                  </div>
+                  <div *ngIf="item.value.bsonType=='bool'">
+                    <ion-button [color]="searched[item.key].op == 'true' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'true')">
+                      {{ 'True' | translate }}
+                    </ion-button>
+                    <ion-button [color]="searched[item.key].op == 'false' ? 'primary' : 'light'" size="small"
+                      (click)="doSetSearchItemOp(item.key, 'false')">
+                      {{ 'False' | translate }}
+                    </ion-button>
+                  </div>
+                  <div>
+                    <ion-input *ngIf="item.value.bsonType!='bool'"
+                      [type]="item.value.bsonType!='string' ? item.value.bsonType : 'text'" size="32"
+                      [(ngModel)]="searched[item.key].kw" [ngModelOptions]="{standalone: true}"
+                      class="ion-no-padding search-input" placeholder="{{ 'Search' | translate }}" disabled="false">
+                    </ion-input>
+                  </div>
+                  <ion-button size="small" (click)="doSearch(item.key, searched[item.key].kw)">
+                    {{ 'Search' | translate }}
                   </ion-button>
-                  <ion-button [color]="searched[item.key].op == 'false' ? 'primary' : 'light'" size="small"
-                    (click)="doSetSearchItemOp(item.key, 'false')">
-                    {{ 'False' | translate }}
+                  <ion-button color="light" size="small" (click)="doResetSearchItem(item.key)">
+                    {{ 'Cancel' | translate }}
                   </ion-button>
                 </div>
-                <div>
-                  <ion-input *ngIf="item.value.bsonType!='bool'"
-                    [type]="item.value.bsonType!='string' ? item.value.bsonType : 'text'" size="32"
-                    [(ngModel)]="searched[item.key].kw" [ngModelOptions]="{standalone: true}"
-                    class="ion-no-padding search-input" placeholder="{{ 'Search' | translate }}" disabled="false">
-                  </ion-input>
-                </div>
-                <ion-button size="small" (click)="doSearch(item.key, searched[item.key].kw)">
-                  {{ 'Search' | translate }}
-                </ion-button>
-                <ion-button color="light" size="small" (click)="doResetSearchItem(item.key)">
-                  {{ 'Cancel' | translate }}
-                </ion-button>
-              </div>
-            </th>
-            <th>
-              {{ 'Created At' | translate }}<br />
-              {{ '_created_at' }}
-            </th>
-            <th>
-              {{ 'Created By' | translate }}<br />
-              {{ '_created_by' }}
-            </th>
-            <th>
-              {{ 'Modified At' | translate }}<br />
-              {{ '_modified_at' }}
-            </th>
-            <th>
-              {{ 'Modified By' | translate }}<br />
-              {{ '_modified_by' }}
-            </th>
-            <th>
-              {{ 'Record ID' | translate }}<br />
-              {{ '_id' }}
-            </th>
-          </tr>
-          <tr *ngFor="let record of data; let i = index"
-            (click)="id=='_query' ? go_query(record, $event) : go_crud(record, 'update')">
-            <td class="primary aligned-right">{{ ((pager_ - 1) * limit_) + i + 1}}</td>
-            <td (click)="tdc($event)">
-              <ion-checkbox id="checkbox" [(ngModel)]="selected[i]" [checked]="selected[i]"
-                (ionChange)="SetSelectData(i,$event)" mode="md">
-              </ion-checkbox>
-            </td>
-            <td *ngFor="let item_ of properties_ | keyvalue : orderByIndex">
-              <span *ngIf="item_.value.bsonType=='date'; else else1">
-                <span *ngIf="item_.value?.dateOnly; else nodateOnly">{{ record[item_.key] | date:'dd.MM.yyyy' }}</span>
-                <ng-template #nodateOnly>
-                  {{ record[item_.key] | date:'dd.MM.yyyy HH:mm:ss' }}
-                </ng-template>
-              </span>
-              <ng-template #else1>
-                <span *ngIf="item_.value.bsonType=='array'; else else2">
-                  <span *ngIf="item_.value.items?.bsonType=='object'; else noarrayobject">
-                    {{ record[item_.key] ? record[item_.key].length : '0' }}
-                    <span *ngIf="record[item_.key]?.length === 1">{{ 'Item' | translate }}</span>
-                    <span *ngIf="record[item_.key]?.length > 1">{{ 'Items' | translate }}</span>
-                  </span>
-                  <ng-template #noarrayobject>
-                    <span *ngIf="record[item_.key]?.length > 0">{{ record[item_.key].join(', ') }}</span>
-                  </ng-template>
-                </span>
-              </ng-template>
-              <ng-template #else2>
-                <span *ngIf="item_.value.bsonType=='bool'; else else3">
-                  <span *ngIf="record[item_.key] && item_.value.trueText">{{ item_.value.trueText | translate }}</span>
-                  <span *ngIf="record[item_.key] && !item_.value.trueText">{{ 'Yes' | translate }}</span>
-                  <span *ngIf="!record[item_.key] && item_.value.falseText">{{ item_.value.falseText | translate
+              </th>
+              <th>
+                {{ 'Created At' | translate }}<br />
+                {{ '_created_at' }}
+              </th>
+              <th>
+                {{ 'Created By' | translate }}<br />
+                {{ '_created_by' }}
+              </th>
+              <th>
+                {{ 'Modified At' | translate }}<br />
+                {{ '_modified_at' }}
+              </th>
+              <th>
+                {{ 'Modified By' | translate }}<br />
+                {{ '_modified_by' }}
+              </th>
+              <th>
+                {{ 'Record ID' | translate }}<br />
+                {{ '_id' }}
+              </th>
+            </tr>
+            <tr *ngFor="let record of data; let i = index"
+              (click)="id=='_query' ? go_query(record, $event) : go_crud(record, 'update')">
+              <td class="primary aligned-right">{{ ((pager_ - 1) * limit_) + i + 1}}</td>
+              <td (click)="tdc($event)">
+                <ion-checkbox id="checkbox" [(ngModel)]="selected[i]" [checked]="selected[i]"
+                  (ionChange)="SetSelectData(i,$event)" mode="md">
+                </ion-checkbox>
+              </td>
+              <td *ngFor="let item_ of properties_ | keyvalue : orderByIndex">
+                <span *ngIf="item_.value.bsonType=='date'; else else1">
+                  <span *ngIf="item_.value?.dateOnly; else nodateOnly">{{ record[item_.key] | date:'dd.MM.yyyy'
                     }}</span>
-                  <span *ngIf="!record[item_.key] && !item_.value.falseText">{{ 'No' | translate }}</span>
+                  <ng-template #nodateOnly>
+                    {{ record[item_.key] | date:'dd.MM.yyyy HH:mm:ss' }}
+                  </ng-template>
                 </span>
-              </ng-template>
-              <ng-template #else3>
-                <span
-                  *ngIf="['number','decimal','float'].includes(item_.value.bsonType) && ['.'].includes(record[item_.key]?.toString()); else else4">{{
-                  record[item_.key]?.toFixed(item_.value.decimals ? item_.value.decimals : 0) }}</span>
-              </ng-template>
-              <ng-template #else4>
-                <span *ngIf="item_.value.bsonType=='object'; else else0">{{ 'Object' | translate }}</span>
-              </ng-template>
-              <ng-template #else0>
-                {{ record[item_.key]?.toString() | translate }}
-              </ng-template>
-            </td>
-            <td>
-              {{ record._created_at?.replace(' ', 'T') | date:'dd.MM.yyyy HH:mm:ss' }}
-            </td>
-            <td>
-              {{ record._created_by }}
-            </td>
-            <td>
-              {{ record._modified_at?.replace(' ', 'T') | date:'dd.MM.yyyy HH:mm:ss' }}
-            </td>
-            <td>
-              {{ record._modified_by }}
-            </td>
-            <td>
-              {{ record._id }}
-            </td>
-          </tr>
-        </table>
-        <div>
-          <ion-button *ngIf="pager_ > 1" size="small" fill="clear" (click)="refresh_data(0)"
-            class="ion-no-padding ion-margin-end">
-            <ion-icon name="play-skip-back"></ion-icon>
-          </ion-button>
-          <span *ngIf="pager_ > 10">
-            <ion-button size="small" fill="clear" (click)="refresh_data(pager_-1)" class="ion-no-padding">
-              <ion-icon name="caret-back"></ion-icon>
-            </ion-button>
-          </span>
-          <span *ngFor="let in of paget_">
-            <ion-button *ngIf="pager_ != in" size="small" fill="clear" (click)="refresh_data(in)" class="ion-no-padding">
-              <ion-label>&nbsp;{{ in }}&nbsp;</ion-label>
-            </ion-button>
-            <ion-button *ngIf="pager_ == in" size="small" fill="clear" class="ion-no-padding text-underlined">
-              <ion-label>&nbsp;{{ in }}&nbsp;</ion-label>
-            </ion-button>
-          </span>
-          <span *ngIf="pages_ > 10 && pager_ < pages_">
-            <ion-button size="small" fill="clear" (click)="refresh_data(pages_)" class="ion-no-padding">
-              ...&nbsp;&nbsp;{{ pages_ }}
+                <ng-template #else1>
+                  <span *ngIf="item_.value.bsonType=='array'; else else2">
+                    <span *ngIf="item_.value.items?.bsonType=='object'; else noarrayobject">
+                      {{ record[item_.key] ? record[item_.key].length : '0' }}
+                      <span *ngIf="record[item_.key]?.length === 1">{{ 'Item' | translate }}</span>
+                      <span *ngIf="record[item_.key]?.length > 1">{{ 'Items' | translate }}</span>
+                    </span>
+                    <ng-template #noarrayobject>
+                      <span *ngIf="record[item_.key]?.length > 0">{{ record[item_.key].join(', ') }}</span>
+                    </ng-template>
+                  </span>
+                </ng-template>
+                <ng-template #else2>
+                  <span *ngIf="item_.value.bsonType=='bool'; else else3">
+                    <span *ngIf="record[item_.key] && item_.value.trueText">{{ item_.value.trueText | translate
+                      }}</span>
+                    <span *ngIf="record[item_.key] && !item_.value.trueText">{{ 'Yes' | translate }}</span>
+                    <span *ngIf="!record[item_.key] && item_.value.falseText">{{ item_.value.falseText | translate
+                      }}</span>
+                    <span *ngIf="!record[item_.key] && !item_.value.falseText">{{ 'No' | translate }}</span>
+                  </span>
+                </ng-template>
+                <ng-template #else3>
+                  <span
+                    *ngIf="['number','decimal','float'].includes(item_.value.bsonType) && ['.'].includes(record[item_.key]?.toString()); else else4">{{
+                    record[item_.key]?.toFixed(item_.value.decimals ? item_.value.decimals : 0) }}</span>
+                </ng-template>
+                <ng-template #else4>
+                  <span *ngIf="item_.value.bsonType=='object'; else else0">{{ 'Object' | translate }}</span>
+                </ng-template>
+                <ng-template #else0>
+                  {{ record[item_.key]?.toString() | translate }}
+                </ng-template>
+              </td>
+              <td>
+                {{ record._created_at?.replace(' ', 'T') | date:'dd.MM.yyyy HH:mm:ss' }}
+              </td>
+              <td>
+                {{ record._created_by }}
+              </td>
+              <td>
+                {{ record._modified_at?.replace(' ', 'T') | date:'dd.MM.yyyy HH:mm:ss' }}
+              </td>
+              <td>
+                {{ record._modified_by }}
+              </td>
+              <td>
+                {{ record._id }}
+              </td>
+            </tr>
+          </table>
+          <div>
+            <ion-button *ngIf="pager_ > 1" size="small" fill="clear" (click)="refresh_data(0)"
+              class="ion-no-padding ion-margin-end">
+              <ion-icon name="play-skip-back"></ion-icon>
             </ion-button>
-            <ion-button size="small" fill="clear" (click)="refresh_data(pager_+1)" class="ion-no-padding">
-              <ion-icon name="caret-forward"></ion-icon>
+            <span *ngIf="pager_ > 10">
+              <ion-button size="small" fill="clear" (click)="refresh_data(pager_-1)" class="ion-no-padding">
+                <ion-icon name="caret-back"></ion-icon>
+              </ion-button>
+            </span>
+            <span *ngFor="let in of paget_">
+              <ion-button *ngIf="pager_ != in" size="small" fill="clear" (click)="refresh_data(in)"
+                class="ion-no-padding">
+                <ion-label>&nbsp;{{ in }}&nbsp;</ion-label>
+              </ion-button>
+              <ion-button *ngIf="pager_ == in" size="small" fill="clear" class="ion-no-padding text-underlined">
+                <ion-label>&nbsp;{{ in }}&nbsp;</ion-label>
+              </ion-button>
+            </span>
+            <span *ngIf="pages_ > 10 && pager_ < pages_">
+              <ion-button size="small" fill="clear" (click)="refresh_data(pages_)" class="ion-no-padding">
+                ...&nbsp;&nbsp;{{ pages_ }}
+              </ion-button>
+              <ion-button size="small" fill="clear" (click)="refresh_data(pager_+1)" class="ion-no-padding">
+                <ion-icon name="caret-forward"></ion-icon>
+              </ion-button>
+            </span>
+            <ion-button size="small" fill="clear" (click)="misc.navi.next('settings/profile-settings')"
+              class="ion-no-padding ion-margin-start">
+              <ion-icon name="list-outline"></ion-icon>
+              {{ 'Pagination' | translate }} [{{ limit_ }}]
             </ion-button>
-          </span>
-          <ion-button size="small" fill="clear" (click)="misc.navi.next('settings/profile-settings')"
-            class="ion-no-padding ion-margin-start">
-            <ion-icon name="list-outline"></ion-icon>
-            {{ 'Pagination' | translate }} [{{ limit_ }}]
-          </ion-button>
+          </div>
         </div>
+        <ng-template #notinit>
+          <div class="ion-margin-top">
+            {{ 'Initializing' | translate }}...
+          </div>
+        </ng-template>
       </ion-col>
     </ion-row>
   </ion-grid>