diff --git a/lib/approval2/controller_additions.rb b/lib/approval2/controller_additions.rb
index 2c00c79..6f8c4d8 100644
--- a/lib/approval2/controller_additions.rb
+++ b/lib/approval2/controller_additions.rb
@@ -3,9 +3,9 @@ module ControllerAdditions
     extend ActiveSupport::Concern
 
     included do
-      before_filter :before_edit, only: :edit
-      before_filter :before_approve, only: :approve
-      before_filter :before_index, only: :index
+      before_action :before_edit, only: :edit
+      before_action :before_approve, only: :approve
+      before_action :before_index, only: :index
     end
 
 
diff --git a/lib/approval2/model_additions.rb b/lib/approval2/model_additions.rb
index d180b5f..c3bf96e 100644
--- a/lib/approval2/model_additions.rb
+++ b/lib/approval2/model_additions.rb
@@ -9,16 +9,13 @@ module ModelAdditions
       has_one :unapproved_record_entry, :as => :approvable, :class_name => '::UnapprovedRecord'
  
       # refers to the approved/unapproved record in the model
-      belongs_to :unapproved_record, :primary_key => 'approved_id', :foreign_key => 'id', :class_name => self.name, :unscoped => true
-      belongs_to :approved_record, :foreign_key => 'approved_id', :primary_key => 'id', :class_name => self.name, :unscoped => true
+      belongs_to :unapproved_record, -> { unscope(where: :approval_status) }, :primary_key => 'approved_id', :foreign_key => 'id', :class_name => self.name
+      belongs_to :approved_record, -> { unscope(where: :approval_status) }, :foreign_key => 'approved_id', :primary_key => 'id', :class_name => self.name
 
       validates_uniqueness_of :approved_id, :allow_blank => true
       validate :validate_unapproved_record
 
-      def self.default_scope
-        where approval_status: 'A'
-      end
-
+      default_scope { where('approval_status = ?', 'A') }
 
       after_create :on_create_create_unapproved_record_entry
       after_destroy :on_destory_remove_unapproved_record_entries
@@ -70,7 +67,7 @@ def enable_approve_button?
       self.approval_status == 'U' ? true : false
     end
 
-      def on_create_create_unapproved_record_entry
+    def on_create_create_unapproved_record_entry
       if approval_status == 'U'
         UnapprovedRecord.create!(:approvable => self)
       end
diff --git a/lib/approval2/version.rb b/lib/approval2/version.rb
index 32da5af..89ba8bb 100644
--- a/lib/approval2/version.rb
+++ b/lib/approval2/version.rb
@@ -1,3 +1,3 @@
 module Approval2
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end