diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder
index 6f33ac35e..80a54d477 100644
--- a/app/views/repositories/_simple_entry.json.jbuilder
+++ b/app/views/repositories/_simple_entry.json.jbuilder
@@ -32,6 +32,8 @@ end
 
 if @project.educoder?
   file_path = params[:filepath].present? ? [params[:filepath], entry['name']].join('/') : entry['name']
+  file_type = File.extname(entry['name'].to_s)[1..-1]
+  image_type = image_type?(file_type)
 
   json.name entry['name']
   json.sha nil
@@ -42,7 +44,7 @@ if @project.educoder?
   json.target nil
   json.download_url nil
   json.direct_download false
-  json.image_type false
+  json.image_type image_type
   json.is_readme_file false
   json.commit do
     json.message entry['title']
diff --git a/app/views/repositories/sub_entries.json.jbuilder b/app/views/repositories/sub_entries.json.jbuilder
index 4e6932210..296e307f4 100644
--- a/app/views/repositories/sub_entries.json.jbuilder
+++ b/app/views/repositories/sub_entries.json.jbuilder
@@ -24,6 +24,12 @@ if @project.educoder?
     end
   end
   json.entries do
-    json.partial! 'repositories/simple_entry', locals: { entry: @sub_entries['trees']}
+    if @sub_entries['trees'].is_a?(Array)
+      json.array! @sub_entries['trees'] do |entry|
+        json.partial! 'repositories/simple_entry', locals: { entry: entry }
+      end
+    elsif @sub_entries['trees'].is_a?(Hash)
+      json.partial! 'repositories/simple_entry', locals: { entry: @sub_entries['trees'] }
+    end
   end
 end