[676-add-support-for-server-tags-in-the-cb_cmds-hooks-library] Better fixes...

src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc

@@ -197,10 +197,11 @@ TestConfigBackendDHCPv4::getGlobalParameter4(const db::ServerSelector& server_se
         for (auto tag : tags) {
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
-            } else if ((*global_it)->hasAllServerTag()) {
-                candidate = *global_it;
             }
         }
+        if ((*global_it)->hasAllServerTag()) {
+            candidate = *global_it;
+        }
     }
 
     return (candidate);

src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc

@@ -197,7 +197,8 @@ TestConfigBackendDHCPv6::getGlobalParameter6(const db::ServerSelector& server_se
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
             }
-        } else if ((*global_it)->hasAllServerTag()) {
+        }
+        if ((*global_it)->hasAllServerTag()) {
             candidate = *global_it;
         }
     }