diff --git a/Gemfile.lock b/Gemfile.lock
index 35d9dd2b..204073ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/murb/omniauth-azure-activedirectory.git
-  revision: 5c771f66e4c9fe79ab97cc5a103f78455aa58b1d
+  revision: ac7f53812bed8aab4b4b7c7057f7870d5b993d25
   specs:
     omniauth-azure-activedirectory (1.1.0)
       jwt (~> 2.2.2)
@@ -41,86 +41,76 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.2)
     act_as_time_as_boolean (1.0.1)
       activesupport (>= 3.2)
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
-      timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
-    activesupport (7.1.2)
-      base64
-      bigdecimal
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
-      mutex_m
       tzinfo (~> 2.0)
-    acts-as-taggable-on (10.0.0)
-      activerecord (>= 6.1, < 7.2)
-    addressable (2.8.6)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     airbrussh (1.5.0)
       sshkit (>= 1.6.1, != 1.7.0)
@@ -129,23 +119,22 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attribute_normalizer (1.2.0)
-    autoprefixer-rails (10.4.16.0)
+    autoprefixer-rails (10.4.15.0)
       execjs (~> 2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    base64 (0.2.0)
-    bcrypt (3.1.20)
-    bigdecimal (3.1.5)
+    base64 (0.1.1)
+    bcrypt (3.1.19)
     bindex (0.8.1)
-    bootsnap (1.17.0)
+    bootsnap (1.16.0)
       msgpack (~> 1.2)
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
     builder (3.2.4)
-    bullet (7.1.5)
+    bullet (7.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundler-audit (0.9.1)
@@ -153,7 +142,7 @@ GEM
       thor (~> 1.0)
     byebug (11.1.3)
     cancancan (3.5.0)
-    capistrano (3.18.0)
+    capistrano (3.17.3)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -179,7 +168,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.5)
+    carrierwave (2.2.4)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -190,7 +179,7 @@ GEM
     carrierwave-imageoptimizer (1.6.0)
       carrierwave (>= 0.8, < 3.0)
       image_optimizer (~> 1.6)
-    caxlsx (4.0.0)
+    caxlsx (3.4.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -207,8 +196,8 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
-    devise (4.9.3)
+    date (3.3.3)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -220,20 +209,18 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
-    elasticsearch (7.17.10)
-      elasticsearch-api (= 7.17.10)
-      elasticsearch-transport (= 7.17.10)
-    elasticsearch-api (7.17.10)
+    elasticsearch (7.17.9)
+      elasticsearch-api (= 7.17.9)
+      elasticsearch-transport (= 7.17.9)
+    elasticsearch-api (7.17.9)
       multi_json
     elasticsearch-model (7.2.1)
       activesupport (> 3)
       elasticsearch (~> 7)
       hashie
     elasticsearch-rails (7.2.1)
-    elasticsearch-transport (7.17.10)
-      faraday (>= 1, < 3)
+    elasticsearch-transport (7.17.9)
+      faraday (~> 1)
       multi_json
     erubi (1.12.0)
     et-orbi (1.2.7)
@@ -242,11 +229,29 @@ GEM
       actionmailer (>= 5.2, < 8)
       activesupport (>= 5.2, < 8)
     execjs (2.9.1)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     ffi (1.16.3)
     flamegraph (0.9.5)
     foreman (0.87.2)
@@ -254,14 +259,13 @@ GEM
       railties (>= 3.1.0)
       sass (>= 3.3.0)
       sprockets-es6 (>= 0.9.0)
-    fugit (1.9.0)
+    fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashie (5.0.0)
-    highline (3.0.0)
-      abbrev
+    highline (2.1.0)
     htmlentities (4.3.4)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -271,16 +275,12 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (2.1.0)
       rails (>= 5.2)
-    io-console (0.7.1)
-    irb (1.11.0)
-      rdoc
-      reline (>= 0.3.8)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
-    json (2.7.1)
+    json (2.6.3)
     jwt (2.2.3)
     keyword_finder (0.3.1)
     kramdown (2.4.0)
@@ -295,7 +295,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lockbox (1.3.0)
-    loofah (2.22.0)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -303,29 +303,30 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     memory_profiler (1.0.1)
+    method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.4)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    mutex_m (0.2.0)
+    multipart-post (2.3.0)
     nested_form (0.3.2)
-    net-imap (0.4.9.1)
+    net-imap (0.4.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.2.1)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-smtp (0.4.0.1)
+    net-smtp (0.4.0)
       net-protocol
-    net-ssh (7.2.1)
-    nio4r (2.7.0)
-    nokogiri (1.16.0)
+    net-ssh (7.2.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (2.0.9)
@@ -335,7 +336,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.2)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -351,51 +352,43 @@ GEM
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
-    paper_trail (15.1.0)
+    paper_trail (15.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
     paper_trail-association_tracking (2.2.1)
       paper_trail (>= 12.0)
-    parallel (1.24.0)
-    parser (3.3.0.1)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    psych (5.1.2)
-      stringio
-    public_suffix (5.0.4)
-    puma (6.4.1)
+    public_suffix (5.0.3)
+    puma (6.4.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.7.1)
     rack (2.2.8)
     rack-headers_filter (0.0.1)
-    rack-mini-profiler (3.3.0)
+    rack-mini-profiler (3.1.1)
       rack (>= 1.2.0)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
+    rack-protection (3.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.0.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -403,32 +396,29 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
-      irb
-      rackup (>= 1.0.0)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
+      method_source
       rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rdoc (6.6.2)
-      psych (>= 4.0.0)
     redis (4.8.1)
-    redis-actionpack (5.4.0)
+    redis-actionpack (5.3.0)
       actionpack (>= 5, < 8)
-      redis-rack (>= 2.1.0, < 4)
+      redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
     redis-activesupport (5.3.0)
       activesupport (>= 3, < 8)
       redis-store (>= 1.3, < 2)
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
+    redis-rack (2.1.4)
+      rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
@@ -436,12 +426,10 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.10.0)
       redis (>= 4, < 6)
-    regexp_parser (2.8.3)
-    reline (0.4.2)
-      io-console (~> 0.5)
+    regexp_parser (2.8.2)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.1)
+    responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)
@@ -453,10 +441,10 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-openapi (0.10.0)
+    rspec-openapi (0.9.0)
       actionpack (>= 5.2.0)
       rspec-core
-    rspec-rails (6.1.0)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -467,25 +455,26 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.59.0)
+    rubocop (1.56.4)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.20.1)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-performance (1.19.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-ole (1.2.12.2)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.0)
+    ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -514,13 +503,13 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.31)
+    sidekiq-unique-jobs (7.1.30)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)
       sidekiq (>= 5.0, < 7.0)
       thor (>= 0.20, < 3.0)
-    simple_form (5.3.0)
+    simple_form (5.2.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     simplecov (0.22.0)
@@ -548,32 +537,30 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sshkit (1.21.7)
-      mutex_m
+    sshkit (1.21.5)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     ssrf_filter (1.1.2)
     stackprof (0.2.25)
-    standard (1.33.0)
+    standard (1.31.2)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.59.0)
+      rubocop (~> 1.56.4)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.3)
+      standard-performance (~> 1.2)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.3.0)
+    standard-performance (1.2.1)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.20.1)
-    stimulus-rails (1.3.3)
+      rubocop-performance (~> 1.19.1)
+    stimulus-rails (1.3.0)
       railties (>= 6.0.0)
-    stringio (3.1.0)
     strip_attributes (1.13.0)
       activemodel (>= 3.0, < 8.0)
-    thor (1.3.0)
+    thor (1.2.2)
     tilt (2.3.0)
-    timeout (0.4.1)
+    timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -586,7 +573,6 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
diff --git a/app/controllers/batch/base_form.rb b/app/controllers/batch/base_form.rb
index 74d1c920..75f405d8 100644
--- a/app/controllers/batch/base_form.rb
+++ b/app/controllers/batch/base_form.rb
@@ -25,7 +25,7 @@ def removable_fields
     end
 
     def strategy_attribute_for(field_name)
-      :"update_#{field_name}_strategy"
+      "update_#{field_name}_strategy".to_sym
     end
 
     def strategies_for(field_name)
@@ -50,7 +50,7 @@ def strategies_for(field_name)
 
     def default_to_ignore!
       self.class.batch_fields.each do |field_name|
-        send(:"#{self.class.strategy_attribute_for(field_name)}=", :IGNORE) if send(self.class.strategy_attribute_for(field_name)).nil?
+        send("#{self.class.strategy_attribute_for(field_name)}=", :IGNORE) if send(self.class.strategy_attribute_for(field_name)).nil?
       end
     end
 
diff --git a/app/controllers/concerns/base_controller.rb b/app/controllers/concerns/base_controller.rb
index e4b9b8cb..c9cf991c 100644
--- a/app/controllers/concerns/base_controller.rb
+++ b/app/controllers/concerns/base_controller.rb
@@ -67,7 +67,7 @@ def authentication_callbacks
     end
 
     def named_collection_url
-      @collection ? send(:"collection_#{controlled_class.table_name}_url", @collection) : send(:"#{controlled_class.table_name}_url")
+      @collection ? send("collection_#{controlled_class.table_name}_url", @collection) : send("#{controlled_class.table_name}_url")
     end
 
     def singularized_name
@@ -75,15 +75,15 @@ def singularized_name
     end
 
     def named_collection_variable= values
-      instance_variable_set(:"@#{controlled_class.table_name}", values)
+      instance_variable_set("@#{controlled_class.table_name}", values)
     end
 
     def named_variable= value
-      instance_variable_set(:"@#{singularized_name}", value)
+      instance_variable_set("@#{singularized_name}", value)
     end
 
     def named_variable
-      instance_variable_get(:"@#{singularized_name}")
+      instance_variable_get("@#{singularized_name}")
     end
 
     def set_named_variable_by_class
diff --git a/app/controllers/works/zip_response.rb b/app/controllers/works/zip_response.rb
index 21fda280..b8c30531 100644
--- a/app/controllers/works/zip_response.rb
+++ b/app/controllers/works/zip_response.rb
@@ -18,7 +18,7 @@ def show_zip_response
         @works.each do |work|
           base_file_name = work.base_file_name
           file_editions.each do |field|
-            if work.send(:"#{field}?")
+            if work.send("#{field}?".to_sym)
               filename_components = [base_file_name]
               filename_components << field.gsub("photo_", "") unless only_front
               filename = "#{filename_components.join("_")}.jpg"
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3987cbcd..38c0893a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -52,10 +52,10 @@ def works_modified_forms_path options = {}
   def link_to_edit item
     if item.is_a? Array
       item_part = item.collect { |a| a.class.model_name.singular }.join("_")
-      url = send(:"edit_#{item_part}_path", *item)
+      url = send("edit_#{item_part}_path".to_sym, *item)
       name = item.last.name
     else
-      url = send(:"edit_#{item.class.model_name.singular}_path", item)
+      url = send("edit_#{item.class.model_name.singular}_path".to_sym, item)
       name = item.name
     end
     link_to name, url
diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb
index 9aef43ce..fe43b7ad 100644
--- a/app/helpers/works_helper.rb
+++ b/app/helpers/works_helper.rb
@@ -64,7 +64,7 @@ def filter_hidden field_name
   def options_from_aggregation_for_select aggregation, selected = nil
     html = ""
     aggregation.each do |k, v|
-      selected_true = selected && (selected == k) || (selected.methods.include?(:include?) && selected.collect { |a| a.to_param }.include?(k.to_param))
+      selected_true = (selected && (selected == k) || (selected.methods.include?(:include?) && selected.collect { |a| a.to_param }.include?(k.to_param)))
       html += "<option value=\"#{k.to_param}\""
       html += "selected=\"selected\"" if selected_true
       html += ">#{v[:name]}</option>"
diff --git a/app/models/ability.rb b/app/models/ability.rb
index a9fe1a38..704547c9 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -20,7 +20,7 @@ def initialize(user)
       alias_action :read_location, :edit_location, to: :manage_location
 
       # default role settings
-      send(:"initialize_#{user.role}")
+      send("initialize_#{user.role}")
 
       # specific cross role functionality
       message_rules
diff --git a/app/models/artist.rb b/app/models/artist.rb
index 38d37c63..4c2f754f 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -209,11 +209,11 @@ def to_parameters
   def import!(other)
     other.to_parameters.each do |k, v|
       skip_name_fields = prefix? || artist_name?
-      empty_value = v.nil? || v.to_s.empty?
-      name_fields = (k == "first_name") || (k == "last_name")
+      empty_value = (v.nil? || v.to_s.empty?)
+      name_fields = ((k == "first_name") || (k == "last_name"))
 
       if !empty_value && !(name_fields && skip_name_fields)
-        send(:"#{k}=", v)
+        send("#{k}=".to_sym, v)
       end
     end
     educational_involvements = []
diff --git a/app/models/batch_photo_upload.rb b/app/models/batch_photo_upload.rb
index a4fe048f..7e1e8285 100644
--- a/app/models/batch_photo_upload.rb
+++ b/app/models/batch_photo_upload.rb
@@ -30,7 +30,7 @@ def couple!
       if image.file_exists? && image.work
         attribute = image.image_type
         work = image.work
-        work.send(:"#{attribute}=", image.file)
+        work.send("#{attribute}=".to_sym, image.file)
         work.save
       end
     end
diff --git a/app/models/collection/hierarchy.rb b/app/models/collection/hierarchy.rb
index b1e74765..b9b51880 100644
--- a/app/models/collection/hierarchy.rb
+++ b/app/models/collection/hierarchy.rb
@@ -66,7 +66,7 @@ def expand_with_child_collections(depth = 5)
       joins(join_sql)
         .select(select_sql)
         .each do |intermediate_result|
-          (depth + 1).times { |a| ids << intermediate_result.send(:"_child_level#{a}") }
+          (depth + 1).times { |a| ids << intermediate_result.send("_child_level#{a}".to_sym) }
         end
       ::Collection.unscoped.where(id: ids.compact.uniq)
     end
diff --git a/app/models/concerns/fast_aggregatable.rb b/app/models/concerns/fast_aggregatable.rb
index 6c741d3f..ca84d2bf 100644
--- a/app/models/concerns/fast_aggregatable.rb
+++ b/app/models/concerns/fast_aggregatable.rb
@@ -23,7 +23,7 @@ def fast_aggregations attributes
     end
     private def _fast_aggregate_column_values rv, attribute
       self.select(attribute).group(attribute).collect { |a| a.send(attribute) }.sort_by(&:to_s).each do |a|
-        value = a || Work::Search::NOT_SET_VALUE
+        value = (a || Work::Search::NOT_SET_VALUE)
         if value.is_a? String
           if attribute == :grade_within_collection
             value = value[0]
diff --git a/app/models/concerns/has_collection_attributes.rb b/app/models/concerns/has_collection_attributes.rb
index b78d2ad4..7fd18099 100644
--- a/app/models/concerns/has_collection_attributes.rb
+++ b/app/models/concerns/has_collection_attributes.rb
@@ -25,7 +25,7 @@ def collection_attributes_attributes= collection_attribute_params
     # for new and create actions
     def populate_collection_attributes(collection:)
       collection = collection.base_collection
-      default_collection_attributes = collection.send(:"default_collection_attributes_for_#{self.class.table_name}")&.select(&:present?)
+      default_collection_attributes = collection.send("default_collection_attributes_for_#{self.class.table_name}")&.select(&:present?)
       default_collection_languages = collection.supported_languages&.select(&:present?) || [:nl]
 
       default_collection_attributes&.each do |attribute_type|
diff --git a/app/models/concerns/method_cache.rb b/app/models/concerns/method_cache.rb
index 86ac17d4..225a5970 100644
--- a/app/models/concerns/method_cache.rb
+++ b/app/models/concerns/method_cache.rb
@@ -22,7 +22,7 @@ def has_cache_for_method(*method_names)
         #   end
         # end
 
-        define_method(:"cache_#{method_name}!") do |update_column = false|
+        define_method("cache_#{method_name}!") do |update_column = false|
           new_cache_value = send(method_name).to_json
           if update_column
             update_column("#{method_name}_cache", new_cache_value)
@@ -31,7 +31,7 @@ def has_cache_for_method(*method_names)
           end
         end
 
-        define_method(:"cached_#{method_name}") do # |arg=nil| # default arg to allow before_blah callbacks
+        define_method("cached_#{method_name}") do # |arg=nil| # default arg to allow before_blah callbacks
           column_value = read_attribute("#{method_name}_cache")
           JSON.parse(column_value) if column_value
         end
diff --git a/app/models/concerns/o_auth_user.rb b/app/models/concerns/o_auth_user.rb
index 588707d7..52610edd 100644
--- a/app/models/concerns/o_auth_user.rb
+++ b/app/models/concerns/o_auth_user.rb
@@ -12,7 +12,7 @@ def oauthable?
     end
 
     def oauth_strategy
-      @oauth_strategy ||= "::OmniAuth::Strategies::#{oauth_provider.classify}".constantize.new(name, Rails.application.secrets.send(:"#{oauth_provider}_id"), Rails.application.secrets.send(:"#{oauth_provider}_secret"), client_options: {site: Rails.application.secrets.send(:"#{oauth_provider}_site")})
+      @oauth_strategy ||= "::OmniAuth::Strategies::#{oauth_provider.classify}".constantize.new(name, Rails.application.secrets.send("#{oauth_provider}_id"), Rails.application.secrets.send("#{oauth_provider}_secret"), client_options: {site: Rails.application.secrets.send("#{oauth_provider}_site")})
     end
 
     def client
diff --git a/app/models/import_collection/class_association.rb b/app/models/import_collection/class_association.rb
index 2e95dc28..beba4c62 100644
--- a/app/models/import_collection/class_association.rb
+++ b/app/models/import_collection/class_association.rb
@@ -5,7 +5,7 @@ class ImportCollection::ClassAssociation
 
   def initialize(options = {})
     options.each do |k, v|
-      send(:"#{k}=", v)
+      send("#{k}=", v)
     end
   end
 
diff --git a/app/models/import_collection/workbook.rb b/app/models/import_collection/workbook.rb
index 12d62c1f..4fe1eb4f 100644
--- a/app/models/import_collection/workbook.rb
+++ b/app/models/import_collection/workbook.rb
@@ -59,7 +59,7 @@ def analyze_field_properties(field)
         column = Work.columns.find { |a| a.name == property.to_s }
         if column
           field_type = column.type
-        elsif Work.instance_methods.include?(fieldname.to_sym) && Work.instance_methods.include?(:"#{fieldname}=")
+        elsif Work.instance_methods.include?(fieldname.to_sym) && Work.instance_methods.include?("#{fieldname}=".to_sym)
           field_type = Work.new.send(fieldname).class
         end
       end
diff --git a/app/models/location.rb b/app/models/location.rb
index 6e219967..e9a9687a 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -38,10 +38,10 @@ def name= name
     return if name.blank?
     name_split = name.split(NAME_SPLITTER)
     if name_split.size > 1 && !persisted?
-      super(name_split[0].strip)
+      super name_split[0].strip
       self.address = name_split[1...].map(&:strip).join("\n").strip
     else
-      super(name.strip)
+      super name.strip
     end
   end
 
diff --git a/app/models/report/builder_helpers.rb b/app/models/report/builder_helpers.rb
index 67d3ef14..8669201f 100644
--- a/app/models/report/builder_helpers.rb
+++ b/app/models/report/builder_helpers.rb
@@ -6,7 +6,7 @@ def basic_aggregation_snippet key, postfix = "", field = nil, missing = nil
       rv = {
         key.to_sym => {
           terms: {
-            field: field || "#{key}#{postfix}", size: 999
+            field: (field || "#{key}#{postfix}"), size: 999
           }
         }
       }
@@ -16,9 +16,9 @@ def basic_aggregation_snippet key, postfix = "", field = nil, missing = nil
 
     def basic_aggregation_snippet_with_missing key, postfix = "", field = nil
       rv = basic_aggregation_snippet(key, postfix, field)
-      rv[:"#{key}_missing"] = {
+      rv["#{key}_missing".to_sym] = {
         missing: {
-          field: field || "#{key}#{postfix}"
+          field: (field || "#{key}#{postfix}")
         }
       }
       rv
diff --git a/app/models/simple_artist.rb b/app/models/simple_artist.rb
index ecaf078a..07773715 100644
--- a/app/models/simple_artist.rb
+++ b/app/models/simple_artist.rb
@@ -12,7 +12,7 @@ def id
 
   def initialize kvs = {}
     kvs.each do |k, v|
-      send(:"#{k}=", v)
+      send("#{k}=", v)
     end
   end
 
diff --git a/app/models/time_span.rb b/app/models/time_span.rb
index 938e10aa..b5d59093 100644
--- a/app/models/time_span.rb
+++ b/app/models/time_span.rb
@@ -78,7 +78,7 @@ class TimeSpan < ApplicationRecord
     (time_spans.starts_at <= :start AND time_spans.ends_at IS NULL) OR
     (time_spans.starts_at > :start AND time_spans.starts_at < :end) OR
     (time_spans.starts_at <= :start AND time_spans.status = 'active')
-    ", {start: period.begin || 2000.years.ago, end: period.end || 2000.years.from_now})
+    ", {start: (period.begin || 2000.years.ago), end: (period.end || 2000.years.from_now)})
                  }
   scope :current, -> { period(Time.now...Time.now) }
   scope :sold, -> { where(status: [:active, :finished]).where(classification: :purchase) }
@@ -143,12 +143,13 @@ def next_time_span
 
   def current?
     current_time = Time.current
-
-    (starts_at.nil? && ends_at.nil?) or
+    (
+      (starts_at.nil? && ends_at.nil?) or
       (starts_at.nil? && ends_at > current_time) or
       (ends_at.nil? && starts_at <= current_time) or
       (starts_at <= current_time && ends_at > current_time) or
       (starts_at <= current_time && status == "active")
+    )
   end
 
   def status= new_status
diff --git a/app/models/user.rb b/app/models/user.rb
index 90bc1572..a5ddb505 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -169,12 +169,12 @@ def accessible_contacts
   end
 
   def accessible_roles
-    @accessible_roles ||= User::ROLES.select { |role| ability.can?(:"update_#{role}", User) }
+    @accessible_roles ||= User::ROLES.select { |role| ability.can?("update_#{role}".to_sym, User) }
   end
 
   def role= new_role
     User::ROLES.each do |r|
-      send(:"#{r}=", r.to_s == new_role.to_s) if methods.include?(r)
+      send("#{r}=", r.to_s == new_role.to_s) if methods.include?(r)
     end
     role
   end
@@ -252,7 +252,7 @@ def messages_sent
   def reset_all_roles
     ROLES.each do |role|
       unless role == :read_only # "default" role
-        send(:"#{role}=", false)
+        send("#{role}=", false)
       end
     end
   end
diff --git a/app/models/work.rb b/app/models/work.rb
index 25549434..442c5b0c 100644
--- a/app/models/work.rb
+++ b/app/models/work.rb
@@ -682,7 +682,7 @@ def quick_destroy_all
     end
 
     def human_attribute_name_for_alt_number_field(field_name, collection)
-      custom_label_name = collection&.send(:"label_override_work_#{field_name}_with_inheritance")
+      custom_label_name = collection&.send("label_override_work_#{field_name}_with_inheritance".to_sym)
       custom_label_name || Work.human_attribute_name(field_name)
     end
 
diff --git a/app/models/work/time_spans.rb b/app/models/work/time_spans.rb
index 41866efb..7d5afa7b 100644
--- a/app/models/work/time_spans.rb
+++ b/app/models/work/time_spans.rb
@@ -23,7 +23,7 @@ def availability_status
     end
 
     def current_active_time_span
-      @current_active_time_span ||= time_spans.reverse.find(&:current_and_active?) || time_spans.reverse.find(&:current_and_active_or_reserved?)
+      @current_active_time_span ||= (time_spans.reverse.find(&:current_and_active?) || time_spans.reverse.find(&:current_and_active_or_reserved?))
     end
 
     def last_active_time_span
diff --git a/app/workers/update_cache_worker.rb b/app/workers/update_cache_worker.rb
index e7ef9eee..4e56a66f 100644
--- a/app/workers/update_cache_worker.rb
+++ b/app/workers/update_cache_worker.rb
@@ -19,7 +19,7 @@ def perform(class_name, field_name, id = nil)
       konstant.pluck(:id).each { |obj_id| UpdateCacheWorker.perform_async(class_name, field_name, obj_id) }
     else
       objekt = class_name.constantize.find(id)
-      objekt.send(:"cache_#{field_name}!", true) # updates the cache using update_column
+      objekt.send("cache_#{field_name}!", true) # updates the cache using update_column
     end
   end
 end
diff --git a/config/initializers/attr_localized.rb b/config/initializers/attr_localized.rb
index 5262f289..0cc2ac5e 100644
--- a/config/initializers/attr_localized.rb
+++ b/config/initializers/attr_localized.rb
@@ -6,7 +6,7 @@ def self.attr_localized(*fields)
     separator = I18n.t("number.format.separator")
 
     fields.each do |field|
-      define_method(:"#{field}=") do |value|
+      define_method("#{field}=") do |value|
         self[field] = if value.is_a?(String)
           value.gsub(Regexp.new("(\\#{delimiter}(\\d\\d\\d))"), '\2').sub(separator, ".")
         else
diff --git a/db/migrate/20160304092143_fix_string_values_to_nil_when_empty.rb b/db/migrate/20160304092143_fix_string_values_to_nil_when_empty.rb
index c8b06235..fd2d35d2 100644
--- a/db/migrate/20160304092143_fix_string_values_to_nil_when_empty.rb
+++ b/db/migrate/20160304092143_fix_string_values_to_nil_when_empty.rb
@@ -6,7 +6,7 @@ def self.up
     columns = [:location, :stock_number, :alt_number_1, :alt_number_2, :alt_number_3, :photo_front, :photo_back, :photo_detail_1, :photo_detail_2, :title, :print, :grade_within_collection, :entry_status, :abstract_or_figurative, :location_detail]
     Work.all.each do |a|
       columns.each do |c|
-        a.send(:"#{c}=", nil) if a.send(c).to_s.strip == ""
+        a.send("#{c}=".to_sym, nil) if a.send(c).to_s.strip == ""
       end
       a.save
     end
diff --git a/spec/requests/name_id_editor_spec.rb b/spec/requests/name_id_editor_spec.rb
index db78a7dd..edf865c1 100644
--- a/spec/requests/name_id_editor_spec.rb
+++ b/spec/requests/name_id_editor_spec.rb
@@ -22,7 +22,7 @@
       constant = name_id_admin_resource.singularize.camelize.constantize
 
       describe "GET /#{name_id_admin_resource}" do
-        let(:path) { send(:"#{name_id_admin_resource}_path") }
+        let(:path) { send("#{name_id_admin_resource}_path") }
 
         it "ignores anonymous request" do
           get path
@@ -40,7 +40,7 @@
         end
       end
       describe "GET /#{name_id_admin_resource}/new" do
-        let(:path) { send(:"new_#{name_id_admin_resource.singularize}_path") }
+        let(:path) { send("new_#{name_id_admin_resource.singularize}_path") }
 
         it "ignores anonymous request" do
           get path
@@ -59,7 +59,7 @@
       end
 
       describe "POST /#{name_id_admin_resource}" do
-        let(:path) { send(:"#{name_id_admin_resource}_path") }
+        let(:path) { send("#{name_id_admin_resource}_path") }
 
         it "does not change #{constant}.count when performed by anonymous" do
           expect {