diff --git a/app/assets/javascripts/toolbar.js b/app/assets/javascripts/toolbar.js
index 78ec4cd..f611ac4 100644
--- a/app/assets/javascripts/toolbar.js
+++ b/app/assets/javascripts/toolbar.js
@@ -33,7 +33,7 @@
 
     table.before('<input name="_method" type="hidden" value="put" />'); // PUT not POST
     table.before('<input name="authenticity_token" type="hidden" value="' + $('meta[name="csrf-token"]').attr('content') + '" />'); // Auth token
-    table.after('<p>I18n.t("helpers.project.project_settings_text")</p>');
+    table.after('<p>' + I18n.t("helpers.project.project_settings_text") + '</p>');
 
     // Default name column
     table.before('<input type="hidden" name="columns[name]" value="1" />');
@@ -50,11 +50,11 @@
         input.attr('checked', 'checked');
     }
 
-    thead.append('<th><label for="columns_select">I18n.t("helpers.select_action")</label></th>');
+    thead.append('<th><label for="columns_select">' + I18n.t("helpers.select_action") + '</label></th>');
     tbody.append('<td><input type="checkbox" id="columns_select" name="columns[select]" value="1" checked disabled /></td>')
 
     var submit = $('<td><input type="Submit" value="Save" class="btn btn-primary" /></td>').appendTo(tfoot);
-        cancel = $('<td><a href="#" class="btn btn-primary">I18n.t("helpers.cancel")</a></td>').appendTo(tfoot);
+        cancel = $('<td><a href="#" class="btn btn-primary">' + I18n.t("helpers.cancel") + '</a></td>').appendTo(tfoot);
 
     cancel.click(function(e) {
       e.preventDefault();
@@ -67,7 +67,7 @@
   /*
      'My plans' filtering
    */
-  var no_matches_message = $('<tr style="display: none;"><td colspan="20">I18n.t("helpers.project.filter.no_matches")</td></tr>').appendTo($('#dmp_table tbody')),
+  var no_matches_message = $('<tr style="display: none;"><td colspan="20">' + I18n.t("helpers.project.filter.no_matches") + '</td></tr>').appendTo($('#dmp_table tbody')),
                     rows = $('#dmp_table tbody tr'),
                   filter = $('#filter');
 
diff --git a/app/views/plans/_list_comments.html.erb b/app/views/plans/_list_comments.html.erb
index 3dae926..ca42f53 100644
--- a/app/views/plans/_list_comments.html.erb
+++ b/app/views/plans/_list_comments.html.erb
@@ -50,7 +50,7 @@
 
 <!-- view latest comment block -->
 <% comments_not_archived = comments.where("archived IS NULL") %>
-<% latest_comment = comments_not_archived.first(:order => "updated_at DESC") %>
+<% latest_comment = comments_not_archived.order("updated_at DESC").first %>
 <% if !latest_comment.nil? then%>
     <div id = "lastet_comment_div_<%= latest_comment.question_id %>" class ="view_comment_class">
         <%= render :partial => "view_comment", locals: {comment: latest_comment} %>