diff --git a/R/get_gbif.R b/R/get_gbif.R
index 2155fe2..88f7376 100644
--- a/R/get_gbif.R
+++ b/R/get_gbif.R
@@ -214,19 +214,20 @@ get_gbif = function(sp_name = NULL,
                                        verbose = TRUE,
                                        strict = TRUE)
 
-    q.crit = !sapply(list(rank,phylum,class,order,family),is.null)
-
-    # Filter by given criterias
-    if (any(q.crit)){
-      id.crit = c("rank","phylum","class","order","family")[q.crit]
-      p.crit = unlist(list(rank,phylum,class,order,family)[q.crit])
-      for (i in 1:length(id.crit)){
-        bone.search = bone.search[c(bone.search[,id.crit[i]])[[1]]%in%p.crit[i],]
-      }
-    }
-
     # Normal procedure with or without criterias
     if (nrow(bone.search)>1){
+
+    	q.crit = !sapply(list(rank,phylum,class,order,family),is.null)
+
+    	# Filter by given criterias
+    	if (any(q.crit)){
+    		id.crit = c("rank","phylum","class","order","family")[q.crit]
+      	p.crit = unlist(list(rank,phylum,class,order,family)[q.crit])
+      	for (i in 1:length(id.crit)){
+        	bone.search = bone.search[c(bone.search[,id.crit[i]])[[1]]%in%p.crit[i],]
+      	}
+    	}
+
       if (all(!bone.search$rank%in%c("SPECIES","SUBSPECIES","VARIETY"))){
         cat("Not match found...","\n")
         return(NULL)
diff --git a/R/get_status.R b/R/get_status.R
index 71bb235..9d764b4 100644
--- a/R/get_status.R
+++ b/R/get_status.R
@@ -75,19 +75,20 @@ get_status=function(sp_name = NULL,
                                          verbose = TRUE,
                                          strict = TRUE)
 
-      q.crit = !sapply(list(rank,phylum,class,order,family),is.null)
-
-      # Filter by given criterias
-      if (any(q.crit)){
-        id.crit = c("rank","phylum","class","order","family")[q.crit]
-        p.crit = unlist(list(rank,phylum,class,order,family)[q.crit])
-        for (i in 1:length(id.crit)){
-          bone.search = bone.search[c(bone.search[,id.crit[i]])[[1]]%in%p.crit[i],]
-        }
-      }
-
       # Normal procedure with or without criterias
       if (nrow(bone.search)>1){
+
+        q.crit = !sapply(list(rank,phylum,class,order,family),is.null)
+
+        # Filter by given criterias
+        if (any(q.crit)){
+          id.crit = c("rank","phylum","class","order","family")[q.crit]
+          p.crit = unlist(list(rank,phylum,class,order,family)[q.crit])
+          for (i in 1:length(id.crit)){
+            bone.search = bone.search[c(bone.search[,id.crit[i]])[[1]]%in%p.crit[i],]
+          }
+        }
+
         if (all(!bone.search$rank%in%c("SPECIES","SUBSPECIES","VARIETY"))){
           cat("Not match found...","\n")
           return(NULL)