diff --git a/wrenchboard/src/shared_tool/media.cc b/wrenchboard/src/shared_tool/media.cc
index 774e4d44..6f0967a1 100644
--- a/wrenchboard/src/shared_tool/media.cc
+++ b/wrenchboard/src/shared_tool/media.cc
@@ -104,17 +104,17 @@ long WrenchSaveStoredMedia(CVars in, CVars &out) {
     char file_section[50];
     try {
        // REQ_STRING(in, "file_section", 5, 40, "(.*)");
-        REQ_STRING(in, "sessionid", 3, 150, "(.*)");
-        REQ_STRING(in, "file_uid", 3, 150, "(.*)");
-        long file_section_no = REQ_LONG( in, "file_section_no", 1, -1 );
 
-        snprintf(file_section, sizeof (file_section), "%s", in["file_section"].c_str());
+        long file_section_no = REQ_LONG( in, "file_section_no", 1, -1 );
+        REQ_STRING(in, "sessionid", 3, 150, "(.*)");
+        //snprintf(file_section, sizeof (file_section), "%s", in["file_section"].c_str());
 
       switch(file_section_no){
 
                 case WRENCH_FILE_PROFILE:
-                //file_uid  is the UID of the user
-                  REQ_STRING(in, "profile", 5, 40, "(.*)");
+
+                REQ_STRING(in, "uid", 3, 150, "(.*)");
+                REQ_STRING(in, "profile", 5, 40, "(.*)");
                   pgsql_exec("UPDATE members SET profile_pic='%s' "
                              " WHERE uid='%s'",in["profile"].c_str(), in["file_uid"].c_str());
 
@@ -122,17 +122,22 @@ long WrenchSaveStoredMedia(CVars in, CVars &out) {
                 break;
 
                 case WRENCH_FILE_MYFILE:
-                    snprintf(vname, sizeof (vname), "SELECT m.uid AS member_uid, mm.uid AS flie_uid, mm.* "
-                                                     " FROM members_myfiles mm LEFT JOIN members m ON m.id=mm.member_id "
-                                                     " WHERE mm.uid ='%s'", in["file_uid"].c_str());
+//                    snprintf(vname, sizeof (vname), "SELECT m.uid AS member_uid, mm.uid AS flie_uid, mm.* "
+//                                                     " FROM members_myfiles mm LEFT JOIN members m ON m.id=mm.member_id "
+//                                                     " WHERE mm.uid ='%s'", in["file_uid"].c_str());
+                   snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id =1");
                 break;
 
                 case WRENCH_FILE_CONTRACTS:
-                    snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id =1", in["file_uid"].c_str());
+
+                   // snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id =1", in["file_uid"].c_str());
+                   snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id =1");
                 break;
 
                 case WRENCH_FILE_FAMILY:
-                    snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id =1", in["file_uid"].c_str());
+                    REQ_STRING(in, "uid", 3, 150, "(.*)");
+                    REQ_STRING(in, "family_uid", 5, 40, "(.*)");
+                    snprintf(vname, sizeof (vname), "SELECT * FROM members_family WHERE uid ='%s'", in["family_uid"].c_str());
                 break;
       }
 
diff --git a/www-api/app/Models/UploadManager.php b/www-api/app/Models/UploadManager.php
index 7080d171..6a2afc5f 100644
--- a/www-api/app/Models/UploadManager.php
+++ b/www-api/app/Models/UploadManager.php
@@ -63,7 +63,8 @@ class UploadManager extends Model
                     fwrite($myfile, $file_data);
                     fclose($myfile);
                     $out["call_backend"] = false; // flag ready to save data entry
-                    $data['file_uid'] =$in["uid"];
+                    $data['uid'] =$in["uid"];
+                    $data['sessionid'] =$in["sessionid"];
                     $data['profile'] = $in["profile"];
                     $data['member_id'] = $in["member_id"];
                     $data['file_section'] = WRENCH_FILE_PROFILE;