diff --git a/hawk/app/views/nodes/events.html.erb b/hawk/app/views/nodes/events.html.erb
index 83f31c52c..e7a647584 100644
--- a/hawk/app/views/nodes/events.html.erb
+++ b/hawk/app/views/nodes/events.html.erb
@@ -13,7 +13,7 @@
     </h3>
   </div>
   <div class="modal-body">
-    <table id="node-events" data-toggle="table" data-url="<%= cib_ops_path('*,'+@node.name, cib_id: current_cib, format: 'json') %>" data-sortable="true" data-sort-name="last_rc_change" data-sort-order="desc" data-row-style="eventsRowStyle">
+    <table id="node-events" data-toggle="table" data-url="<%= cib_ops_path('*,'+@node.name, cib_id: current_cib) %>?format=json" data-sortable="true" data-sort-name="last_rc_change" data-sort-order="desc" data-row-style="eventsRowStyle">
       <thead>
         <tr>
           <th data-field="rc" data-sortable="true" data-formatter="eventsRC">
diff --git a/hawk/app/views/resources/events.html.erb b/hawk/app/views/resources/events.html.erb
index 160456fd0..5b6f99b35 100644
--- a/hawk/app/views/resources/events.html.erb
+++ b/hawk/app/views/resources/events.html.erb
@@ -13,7 +13,7 @@
     </h3>
   </div>
   <div class="modal-body">
-    <table data-toggle="table" data-url='<%= cib_ops_path("#{@resource.id},*", cib_id: current_cib, format: "json") %>' data-sortable='true' data-sort-name='last_rc_change' data-sort-order='desc' data-row-style='eventsRowStyle' id="resource-events">
+    <table data-toggle="table" data-url='<%= cib_ops_path("#{@resource.id},*", cib_id: current_cib) %>?format=json' data-sortable='true' data-sort-name='last_rc_change' data-sort-order='desc' data-row-style='eventsRowStyle' id="resource-events">
       <thead>
         <tr>
           <th data-field="rc" data-sortable="true" data-formatter="eventsRC">
diff --git a/hawk/config/routes.rb b/hawk/config/routes.rb
index 3ea82d76c..89f699281 100644
--- a/hawk/config/routes.rb
+++ b/hawk/config/routes.rb
@@ -4,13 +4,13 @@
 Rails.application.routes.draw do
   root to: "pages#index"
 
-  regex_safe_id = /[^\^\/\[\]"<>#%{}|\\~`;?:@=&]+?/
+  regex_safe_id = /[^\^\/\[\]"<>#%{}|\\~`;?:@=&]+/
 
   resources :cib, only: [] do
     get "/", via: [:get, :post, :options], to: "cib#show", as: ""
     match "/", via: [:options], to: "cib#show"
     match "/apply", as: :apply, to: 'cib#apply', via: [:get, :post]
-    get "/ops/:id", to: "cib#ops", as: :ops, constraints: {id: regex_safe_id }
+    get "/ops/:id", to: "cib#ops", as: :ops, constraints: { id: regex_safe_id }
 
     get "/fencing", to: "fencing#index"
     get "/fencing/edit", to: "fencing#edit"