diff --git a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
index 8b9fb0a2c50..0cfe704a470 100644
--- a/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
+++ b/appserver/admingui/payara-console-extras/src/main/java/fish/payara/admingui/extras/rest/PayaraRestApiHandlers.java
@@ -262,6 +262,8 @@ public static void hasRestEndpoints(HandlerContext handlerCtx) {
                 result.put(componentName, false);
                 if((List)payaraEndpointsExtraProps.get("endpointList") != null) {
                     result.put(componentName, true);
+                     // Change the component type to JAX-RS. Couldn't be obtained at an earlier point since JAX-RS resources are compiled to JSP.
+                    rowMap.put("type", "JAX-RS");
                 }
             }
           }catch(Exception ex){
diff --git a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
index 17a188fab79..920d91d3e6a 100644
--- a/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
+++ b/appserver/deployment/javaee-core/src/main/java/org/glassfish/javaee/core/deployment/ListSubComponentsCommand.java
@@ -368,6 +368,7 @@ private Map<String, String> getModuleLevelComponents(BundleDescriptor bundle,
                 StringBuffer sb = new StringBuffer();    
                 String canonicalName = wcd.getCanonicalName();
                 sb.append("<");
+                 // The component type is limited to JSP or Servlet at this level. JAX-RS resources for example need to be obtained elsewhere.
                 String wcdType = (wcd.isServlet() ? "Servlet" : "JSP");
                 sb.append(wcdType);
                 sb.append(">");