diff --git a/reports/templates/reports/create.html b/reports/templates/reports/create.html
index 1410a73..baa3d32 100644
--- a/reports/templates/reports/create.html
+++ b/reports/templates/reports/create.html
@@ -50,7 +50,7 @@
     <script type="text/javascript" src="{% static "reports/js/report.js" %}"></script>
 	<script>
 
-    var subject_id = "{{subject.id}}";
+    
     $('.resource-tag-formset').formset({
         addText: 'add data source',
         deleteText: 'remove data source',
@@ -63,7 +63,8 @@
 
                 }
                 //Set initial tag options
-                $.get("{% url 'subjects:reports:get_tags' %}?resource_id="+fields[0].value, function(data){
+                var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option
+                $.get("{% url 'subjects:reports:get_tags' %}?resource_class_name="+fields[0].value+"&subject_id={{subject.id}}"+"&topic_choice="+form_topic, function(data){
                         fields[1].options.length = 0;
                         for(var j = 0; j < data.tags.length; j++){ 
                             fields[1].options[fields[1].options.length] = new Option(data.tags[j].name,data.tags[j].id);
@@ -72,8 +73,10 @@
 
                 //Modify tags fields - on resource type value modifies
                 fields[0].onchange = function(item){
-                    //it request all tags associated with that resource 
-                    $.get("{% url 'subjects:reports:get_tags' %}?resource_id="+item.target.value, function(data){
+                    //it request all tags associated with that resource
+                    var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option
+
+                    $.get("{% url 'subjects:reports:get_tags' %}?resource_class_name="+item.target.value+"&"+"subject_id={{subject.id}}"+"&topic_choice="+form_topic, function(data){
                         fields[1].options.length = 0;
                         for(var j = 0; j < data.tags.length; j++){ 
                             fields[1].options[fields[1].options.length] = new Option(data.tags[j].name,data.tags[j].id);
diff --git a/reports/views.py b/reports/views.py
index 9748b34..f5b0afd 100644
--- a/reports/views.py
+++ b/reports/views.py
@@ -230,31 +230,36 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
 
 
 def get_resources(request):
-    subject = Subject.objects.get(id=request.GET['subject_id'])
 
-    topics = subject.topic_subject.all()
-    #get all resources associated with topics
-    resources = []
-    tags = []
-    for topic in topics:
-        resources_set = topic.resource_topic.all()
-        for resource in resources_set:
-            for tag in resource.tags.all():
-                tags.append(tag)
-            resources.append(resource)
+    #get all possible resources
+    classes = Resource.__subclasses__()    
 
     data = {}
-   
-    data['resources']= [ {'id':resource.id, 'name':resource.name} for resource in  resources]
+
+    
+    data['resources']= [ {'id':class_name.__name__, 'name':class_name.__name__} for class_name in  classes]
     return JsonResponse(data)
 
 
 def get_tags(request):
-    resource = Resource.objects.get(id=request.GET['resource_id'])
+    resource_type = request.GET['resource_class_name']
+    subject = Subject.objects.get(id=request.GET['subject_id'])
+    topic_choice = request.GET["topic_choice"]
+    if topic_choice.lower() == "all":
+        topics = subject.topic_subject.all()
+    else:
+        topics = [Topic.objects.get(id=int(topic_choice))]
     data = {}
     tags = []
+    for topic in topics:
+        resource_set = Resource.objects.select_related(resource_type.lower()).filter(topic = topic)
+       
+        for resource in resource_set:
+            if resource._my_subclass == resource_type.lower():
+                for tag in resource.tags.all():
+                    tags.append(tag)
+    
    
-    for tag in resource.tags.all():
-        tags.append(tag)
+  
     data['tags'] = [ {'id':tag.id, 'name':tag.name} for tag in  tags]
     return JsonResponse(data)
--
libgit2 0.21.2