diff --git a/src/components/results/tabData.vue b/src/components/results/tabData.vue
index 00e778b7..fd2da508 100644
--- a/src/components/results/tabData.vue
+++ b/src/components/results/tabData.vue
@@ -23,7 +23,7 @@
             </v-alert>
         </v-flex>
 
-        <v-flex xs12 v-else-if="$store.state.search.query_status === 200">
+        <v-flex xs12 v-else-if="$store.state.search.query_status === 200 && $store.state.results.total" >
             <v-toolbar flat color="white">
                 <v-toolbar-title>
                     <v-layout column pt-3>
diff --git a/src/components/results/tabs/TabGeneral.vue b/src/components/results/tabs/TabGeneral.vue
index e5e11e33..099268d0 100644
--- a/src/components/results/tabs/TabGeneral.vue
+++ b/src/components/results/tabs/TabGeneral.vue
@@ -242,18 +242,28 @@ export default {
                         this.mjdToDate(this.ztf_object.lastmjd).slice(0, -3) +
                         "UT"
                 },
-                {
-                    column: "PanSTARRS ID",
-                    value: this.$store.state.results.avroInfo.objectidps1
-                },
-                {
-                    column: "Distance (arcsec)",
-                    value: this.$store.state.results.avroInfo.distpsnr1.toFixed(4)
-                },
-                {
-                    column: "Star Galaxy Score",
-                    value: this.$store.state.results.avroInfo.sgscore1.toFixed(4)
-                }
+                this.$store.state.results.avroInfo.objectidps1
+                    ? {
+                          column: "PanSTARRS ID",
+                          value: this.$store.state.results.avroInfo.objectidps1
+                      }
+                    : null,
+                this.$store.state.results.avroInfo.distpsnr1
+                    ? {
+                          column: "Distance (arcsec)",
+                          value: this.$store.state.results.avroInfo.distpsnr1.toFixed(
+                              4
+                          )
+                      }
+                    : null,
+                this.$store.state.results.avroInfo.sgscore1
+                    ? {
+                          column: "Star Galaxy Score",
+                          value: this.$store.state.results.avroInfo.sgscore1.toFixed(
+                              4
+                          )
+                      }
+                    : null
             ];
             let filtered = info.filter(function(el) {
                 return el != null;