More query updates to deal with Rails 4 deprecations