diff --git a/app/admin/questions.rb b/app/admin/questions.rb
index 03cdea0..4810bc5 100644
--- a/app/admin/questions.rb
+++ b/app/admin/questions.rb
@@ -18,11 +18,11 @@ ActiveAdmin.register Question do
 
   controller do
     def show
-      @question = Question.unscoped.find_by!(permitted_params[:question])
+      @question = Question.unscoped.find_by!(permitted_params[:id])
     end
 
     def edit
-      @question = Question.unscoped.find_by!(permitted_params[:question])
+      @question = Question.unscoped.find_by!(permitted_params[:id])
     end
 
     def destroy
diff --git a/app/admin/users.rb b/app/admin/users.rb
index b220a19..863a3dd 100644
--- a/app/admin/users.rb
+++ b/app/admin/users.rb
@@ -6,11 +6,11 @@ ActiveAdmin.register User do
 
   controller do
     def show
-      @user = User.unscoped.find_by!(permitted_params[:user])
+      @user = User.unscoped.find(permitted_params[:id])
     end
 
     def edit
-      @user = User.unscoped.find_by!(permitted_params[:user])
+      @user = User.unscoped.find(permitted_params[:id])
     end
 
     def destroy
diff --git a/app/graphql/resolvers/reviewers_query_resolver.rb b/app/graphql/resolvers/reviewers_query_resolver.rb
index 5a27465..c934d62 100644
--- a/app/graphql/resolvers/reviewers_query_resolver.rb
+++ b/app/graphql/resolvers/reviewers_query_resolver.rb
@@ -6,11 +6,11 @@ module Resolvers
     end
 
     def resolve
-      UserPolicy::Scope.new(@context[:current_user], User)
-        .resolve
-        .where(roles: %i[teacher nde])
+      scope = UserPolicy::Scope.new(@context[:current_user], User).resolve
         .where.not(id: @context[:current_user].id)
         .distinct
+
+      scope.filter { |u| u.roles.any?('teacher') || u.roles.any?('nde') }
     end
   end
 end