Fix broken queries (caused by keeping default scopes as of Rails 4.1)