diff --git a/ngcp/up.lua b/ngcp/up.lua
index e873a45..dd8a22a 100644
--- a/ngcp/up.lua
+++ b/ngcp/up.lua
@@ -12,32 +12,30 @@ NGCPUserPrefs_MT = { __index = NGCPUserPrefs }
             config = config,
             db_table = "usr_preferences"
         }
-        setmetatable( t, NGCPUserPrefs_MT )
-        return t
+        return setmetatable( t, NGCPUserPrefs_MT )
     end
 
     function NGCPUserPrefs:caller_load(uuid)
-        self:_load(0,uuid)
+        NGCPUserPrefs._load(self,"caller",uuid)
     end
 
     function NGCPUserPrefs:callee_load(uuid)
-        self:_load(1,uuid)
+        NGCPUserPrefs._load(self,"callee",uuid)
     end
 
     function NGCPUserPrefs:_load(level, uuid)
-        local con = self.config:getDBConnection()
+        local con = assert (self.config:getDBConnection())
         local query = "SELECT * FROM " .. self.db_table .. " WHERE uuid ='" .. uuid .. "'"
         local cur = assert (con:execute(query))
         local result = {}
-        local row = cur:fetch(result, "a")
+        local row = cur:fetch({}, "a")
         if row then
             while row do
-                sr.log("info", string.format("result:%s row:%s", table.tostring(result), table.tostring(row)))
+                --sr.log("info", string.format("result:%s row:%s", table.tostring(result), table.tostring(row)))
                 table.insert(result, row)
                 row = cur:fetch({}, "a")
             end
-            sr.log("dbg",string.format("adding xavp %s[%d]", 'domain', level))
-            self.xavp = NGCPXAvp:new(level,'domain',result)
+            self.xavp = NGCPXAvp:new(level,'user',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))
         end
diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua
index 108a75e..347dc32 100644
--- a/tests/ngcp_up.lua
+++ b/tests/ngcp_up.lua
@@ -75,9 +75,11 @@ TestNGCPUserPrefs = {} --class
 
         assertTrue(self.d.xavp)
         assertEquals(self.d.xavp("cli"),"4311001")
+        assertEquals(sr.pv.get("$xavp(user[0]=>cli)"),"4311001")
         assertEquals(self.d.xavp("cc"),"43")
+        assertEquals(sr.pv.get("$xavp(user[0]=>cc)"),"43")
         assertEquals(self.d.xavp("ac"),"1")
-        assertEquals(self.d.xavp("cli"),"4311001")
+        assertEquals(sr.pv.get("$xavp(user[0]=>ac)"),"1")
     end
 
     function TestNGCPUserPrefs:test_callee_load()
@@ -97,11 +99,13 @@ TestNGCPUserPrefs = {} --class
         mc:verify()
 
         assertTrue(self.d.xavp)
+        
         assertEquals(self.d.xavp("cli"),"4311001")
+        assertEquals(sr.pv.get("$xavp(user[1]=>cli)"),"4311001")
         assertEquals(self.d.xavp("cc"),"43")
+        assertEquals(sr.pv.get("$xavp(user[1]=>cc)"),"43")
         assertEquals(self.d.xavp("ac"),"1")
-        assertEquals(self.d.xavp("cli"),"4311001")
-        assertIsNil(self.d.xavp("error_key"))
+        assertEquals(sr.pv.get("$xavp(user[1]=>ac)"),"1")
     end
 -- class TestNGCPUserPrefs