diff --git a/desktop/angular/src/app/shared/netquery/netquery.component.html b/desktop/angular/src/app/shared/netquery/netquery.component.html
index 8a05984b..6b5dfbf0 100644
--- a/desktop/angular/src/app/shared/netquery/netquery.component.html
+++ b/desktop/angular/src/app/shared/netquery/netquery.component.html
@@ -14,9 +14,9 @@
     </svg>
   </div>
 
-  <span class="ml-2 cursor-pointer text-tertiary text-xxs hover:text-primary" (click)="clearQuery()">
+  <button class="bg-transparent hover:bg-transparent ml-2 cursor-pointer text-tertiary text-xxs hover:text-primary p-2" (click)="clearQuery()" (keyup.enter)="clearQuery()">
     Clear All
-  </span>
+  </button>
 </div>
 
 <div class="flex flex-row items-center w-full gap-2">
@@ -129,7 +129,7 @@
     <ng-template #customTimeRange>
       <span class="py-2 uppercase text-xxs text-secondary">Quick Settings</span>
       <ul class="grid grid-flow-row grid-cols-3 py-2 text-xs">
-        <li *ngFor="let qds of quickDateSettings" (click)="applyQuickDateSetting(qds)"
+        <li tabindex="0" *ngFor="let qds of quickDateSettings" (click)="applyQuickDateSetting(qds)" (keyup.enter)="applyQuickDateSetting(qds)"
           class="cursor-pointer text-secondary hover:text-primary px-2 py-1.5 hover:bg-gray-500 hover:bg-opacity-50 rounded-md">
           {{ qds.name }}
         </li>
@@ -350,7 +350,7 @@
       d="M11 3a1 1 0 10-2 0v1a1 1 0 102 0V3zM15.657 5.757a1 1 0 00-1.414-1.414l-.707.707a1 1 0 001.414 1.414l.707-.707zM18 10a1 1 0 01-1 1h-1a1 1 0 110-2h1a1 1 0 011 1zM5.05 6.464A1 1 0 106.464 5.05l-.707-.707a1 1 0 00-1.414 1.414l.707.707zM5 10a1 1 0 01-1 1H3a1 1 0 110-2h1a1 1 0 011 1zM8 16v-1h4v1a2 2 0 11-4 0zM12 14c.015-.34.208-.646.477-.859a4 4 0 10-4.954 0c.27.213.462.519.476.859h4.002z" />
   </svg>
   <span class="font-semibold text-primary">Pro Tip:</span>
-  <span class="protip">
+  <span class="flex items-center gap-1 protip">
     <ng-container *ngTemplateOutlet="proTips?.get(proTipIdx) || null"></ng-container>
   </span>
 </div>
diff --git a/desktop/angular/src/app/shared/netquery/netquery.component.ts b/desktop/angular/src/app/shared/netquery/netquery.component.ts
index d4befb47..a09d18eb 100644
--- a/desktop/angular/src/app/shared/netquery/netquery.component.ts
+++ b/desktop/angular/src/app/shared/netquery/netquery.component.ts
@@ -39,6 +39,7 @@ const freeTextSearchFields: (keyof Partial<NetqueryConnection>)[] = [
   'as_owner',
   'path',
   'profile_name',
+  'remote_ip'
 ]
 
 const groupByKeys: (keyof Partial<NetqueryConnection>)[] = [