diff --git a/OSJ Forum/AndroidManifest.xml b/OSJ Forum/AndroidManifest.xml
index cc9164c..b42b128 100644
--- a/OSJ Forum/AndroidManifest.xml	
+++ b/OSJ Forum/AndroidManifest.xml	
@@ -1,5 +1,5 @@
 <manifest package="org.RickBarrette.osj.forum"
-    android:versionCode="269"
+    android:versionCode="281"
     android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 
     <uses-sdk
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java b/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java
index 4e3df1e..83647c4 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
@@ -494,12 +494,11 @@ public class ForumDatabase {
 		
 		ContentValues id = new ContentValues();
 		id.put(KEY_ID, forumId);
-		upsertTable(TABLE_FORUMS, KEY_ID +" = "+ forumId, id);
+		upsertTable(TABLE_FORUMS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(forumId), id);
 
 		for (final ContentValues item : values) {
 			item.put(KEY_FORUM_ID, forumId);
-			upsertTable(TABLE_FORUM_INFO,
-					KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)), item);
+			upsertTable(TABLE_FORUM_INFO, KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)), item);
 		}
 	}
 
@@ -535,17 +534,11 @@ public class ForumDatabase {
 		id.put(KEY_ID, postId);
 		id.put(KEY_FORUM_ID, forumId);
 		id.put(KEY_TOPIC_ID, topicId);
-		upsertTable(TABLE_THREADS, KEY_ID +" = "+ postId, id);
+		upsertTable(TABLE_THREADS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(postId), id);
 
 		for (final ContentValues item : values) {
-			item.put(KEY_FORUM_ID, forumId);
-			item.put(KEY_TOPIC_ID, topicId);
 			item.put(KEY_POST_ID, postId);
-			upsertTable(
-					TABLE_THREAD_INFO,
-					KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)
-							+ " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId) + " AND " + KEY_POST_ID + " = "
-							+ DatabaseUtils.sqlEscapeString(postId), item);
+			upsertTable( TABLE_THREAD_INFO,	KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_POST_ID + " = " + DatabaseUtils.sqlEscapeString(postId), item);
 		}
 	}
 
@@ -565,14 +558,12 @@ public class ForumDatabase {
 		ContentValues id = new ContentValues();
 		id.put(KEY_ID, topicId);
 		id.put(KEY_FORUM_ID, forumId);
-		upsertTable(TABLE_TOPICS, KEY_ID +" = "+ topicId, id);
+		upsertTable(TABLE_TOPICS, KEY_ID +" = "+ DatabaseUtils.sqlEscapeString(topicId), id);
 
 		for (final ContentValues item : values) {
-			item.put(KEY_FORUM_ID, forumId);
 			item.put(KEY_TOPIC_ID, topicId);
 			upsertTable(TABLE_TOPIC_INFO,
-					KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_FORUM_ID + " = " + DatabaseUtils.sqlEscapeString(forumId)
-							+ " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId), item);
+					KEY + " = " + DatabaseUtils.sqlEscapeString(item.getAsString(KEY)) + " AND " + KEY_TOPIC_ID + " = " + DatabaseUtils.sqlEscapeString(topicId), item);
 		}
 	}
 }