diff --git a/src/addon/mod/data/data.scss b/src/addon/mod/data/data.scss
index 75b6d30ae..d8cb84608 100644
--- a/src/addon/mod/data/data.scss
+++ b/src/addon/mod/data/data.scss
@@ -34,20 +34,21 @@ page-addon-mod-data-edit {
         vertical-align: top;
     }
 
-    .item.item-input.item-block .item-inner ion-input,
-    .item.item-input.item-input-has-focus .item-inner ion-input,
-    .item.item-input.input-has-focus .item-inner ion-input {
-      border: 0 !important;
-      box-shadow: none;
-    }
-
     .addon-data-lantlong {
       display: flex;
     }
 
-    form, .addon-data-advanced-search {
+    .addon-data-contents form,
+    form .addon-data-advanced-search {
         background-color: $list-background-color;
 
+        .item.item-input .item-block .item-inner ion-input,
+        .item.item-input.item-input-has-focus .item-inner ion-input,
+        .item.item-input.input-has-focus .item-inner ion-input {
+          border: 0 !important;
+          box-shadow: none;
+        }
+
         .core-mark-required {
           float: right;
 
diff --git a/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html b/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
index a219e554f..c8acdf842 100644
--- a/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
+++ b/src/addon/mod/data/fields/latlong/component/addon-mod-data-field-latlong.html
@@ -2,11 +2,11 @@
     <ion-input *ngIf="mode == 'search'" type="text" [placeholder]="field.name" [formControlName]="'f_'+field.id"></ion-input>
 
     <span *ngIf="mode == 'edit'" [core-mark-required]="field.required" class="core-mark-required"></span>
-    <div class="addon-data-lantlong">
+    <div *ngIf="mode == 'edit'" class="addon-data-lantlong">
         <ion-input type="text" [formControlName]="'f_'+field.id+'_0'" maxlength="10"></ion-input>
         <span class="placeholder-icon" item-right>°N</span>
     </div>
-    <div class="addon-data-lantlong">
+    <div *ngIf="mode == 'edit'" class="addon-data-lantlong">
         <ion-input type="text" [formControlName]="'f_'+field.id+'_1'" maxlength="10"></ion-input>
         <span class="placeholder-icon" item-right>°E</span>
     </div>
diff --git a/src/addon/mod/data/pages/search/search.html b/src/addon/mod/data/pages/search/search.html
index 687e42605..3103a74d9 100644
--- a/src/addon/mod/data/pages/search/search.html
+++ b/src/addon/mod/data/pages/search/search.html
@@ -10,8 +10,8 @@
 </ion-header>
 <ion-content>
     <div class="fixed-content core-tabs-bar">
-        <a [attr.aria-selected]="!search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.search' | translate}}</a>
-        <a [attr.aria-selected]="search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.advancedsearch' | translate }}</a>
+        <a class="tab-slide" [attr.aria-selected]="!search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.search' | translate}}</a>
+        <a class="tab-slide" [attr.aria-selected]="search.searchingAdvanced" (click)="toggleAdvanced()">{{ 'addon.mod_data.advancedsearch' | translate }}</a>
     </div>
     <form (ngSubmit)="searchEntries()" [formGroup]="searchForm">
         <ion-list no-margin>
diff --git a/src/addon/mod/data/pages/search/search.ts b/src/addon/mod/data/pages/search/search.ts
index 160f0ad59..e5a0ac8a7 100644
--- a/src/addon/mod/data/pages/search/search.ts
+++ b/src/addon/mod/data/pages/search/search.ts
@@ -47,14 +47,26 @@ export class AddonModDataSearchPage {
         this.data = params.get('data');
 
         const advanced = {};
-        this.search.advanced.forEach((field) => {
-            advanced[field.name] = field.value ? this.textUtils.parseJSON(field.value) : '';
-        });
+        if (typeof this.search.advanced == 'object') {
+            Object.keys(this.search.advanced).forEach((index) => {
+                if (typeof this.search.advanced[index] != 'undefined' && typeof this.search.advanced[index].name != 'undefined') {
+                    advanced[this.search.advanced[index].name] = this.search.advanced[index].value ?
+                        this.textUtils.parseJSON(this.search.advanced[index].value) : '';
+                } else {
+                    advanced[index] = this.search.advanced[index] ?
+                        this.textUtils.parseJSON(this.search.advanced[index]) : '';
+                }
+            });
+        } else {
+            this.search.advanced.forEach((field) => {
+                advanced[field.name] = field.value ? this.textUtils.parseJSON(field.value) : '';
+            });
+        }
         this.search.advanced = advanced;
 
         this.searchForm = fb.group({
             text: [this.search.text],
-            sortBy: [this.search.sortBy || 0],
+            sortBy: [this.search.sortBy || '0'],
             sortDirection: [this.search.sortDirection || 'DESC'],
             firstname: [this.search.advanced['firstname'] || ''],
             lastname: [this.search.advanced['lastname'] || '']