diff --git a/OSJ Forum/AndroidManifest.xml b/OSJ Forum/AndroidManifest.xml
index 50055a0..ec8af10 100644
--- a/OSJ Forum/AndroidManifest.xml	
+++ b/OSJ Forum/AndroidManifest.xml	
@@ -1,5 +1,5 @@
 <manifest package="org.RickBarrette.osj.forum"
-    android:versionCode="305"
+    android:versionCode="310"
     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/content/ThreadContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java
index 2d2d0b1..09835bb 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/ThreadContent.java	
@@ -90,7 +90,7 @@ public class ThreadContent {
 		ITEM_MAP.clear();
 
 		final ForumDatabase db = new ForumDatabase(context);
-		final List<String> list = db.getThreads();
+		final List<String> list = db.getThreads(topicId);
 
 		int index = 0;
 		for (final String item : list)
diff --git a/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java
index 4a0400c..0224a7d 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/content/TopicContent.java	
@@ -88,7 +88,7 @@ public class TopicContent {
 		ITEM_MAP.clear();
 
 		final ForumDatabase db = new ForumDatabase(context);
-		final List<String> list = db.getTopics();
+		final List<String> list = db.getTopics(forumId);
 
 		int index = 0;
 		for (final String item : list)
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 bb6d3c7..74ad813 100644
--- a/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
+++ b/OSJ Forum/src/org/RickBarrette/osj/forum/database/ForumDatabase.java	
@@ -421,12 +421,13 @@ public class ForumDatabase {
 	/**
 	 * Retrieves a list of thread ids
 	 * 
+	 * @param id of topic
 	 * @return
 	 * @author ricky barrette
 	 */
-	public List<String> getThreads() {
+	public List<String> getThreads(String id) {
 		final ArrayList<String> list = new ArrayList<String>();
-		final Cursor c = mDb.query(TABLE_THREADS, new String[] { KEY_ID }, null, null, null, null, null);
+		final Cursor c = mDb.query(TABLE_THREADS, new String[] { KEY_ID }, KEY_TOPIC_ID +" = "+ DatabaseUtils.sqlEscapeString(id), null, null, null, null);
 		if (c.moveToFirst())
 			do
 				list.add(c.getString(0));
@@ -449,12 +450,13 @@ public class ForumDatabase {
 	/**
 	 * Retrieves a list of topic ids
 	 * 
+	 * @param id of forum
 	 * @return
 	 * @author ricky barrette
 	 */
-	public List<String> getTopics() {
+	public List<String> getTopics(String id) {
 		final ArrayList<String> list = new ArrayList<String>();
-		final Cursor c = mDb.query(TABLE_TOPICS, new String[] { KEY_ID }, null, null, null, null, null);
+		final Cursor c = mDb.query(TABLE_TOPICS, new String[] { KEY_ID }, KEY_FORUM_ID +" = "+ DatabaseUtils.sqlEscapeString(id) , null, null, null, null);
 		if (c.moveToFirst())
 			do
 				list.add(c.getString(0));