diff --git a/SAS/TMSS/src/tmss/tmssapp/views.py b/SAS/TMSS/src/tmss/tmssapp/views.py
index 57f7b497ac038c9cd0123c43b2ae22c4776a2d87..a427ee8c33283082302861eb0366683c16b9b33a 100644
--- a/SAS/TMSS/src/tmss/tmssapp/views.py
+++ b/SAS/TMSS/src/tmss/tmssapp/views.py
@@ -51,11 +51,11 @@ def task_specify_observation(request, pk=None):
 # Allow everybody to GET our publicly available template-json-schema's
 @permission_classes([AllowAny])
 @authentication_classes([AllowAny])
-@swagger_auto_schema(method='GET',
+@swagger_auto_schema(#method='GET',
                      responses={200: 'Get the JSON schema from the template with the requested <template>, <name> and <version>',
                                 404: 'the schema with requested <template>, <name> and <version> is not available'},
                      operation_description="Get the JSON schema for the given <template> with the given <name> and <version> as application/json content response.")
-@api_view(['GET'])
+#@api_view(['GET'])   # todo: !! decorating this as api_view somehow breaks json ref resolution !! fix this and double url issue in urls.py, then use decorator here to include in Swagger
 def get_template_json_schema(request, template:str, name:str, version:str):
     template_model = apps.get_model("tmssapp", template)
     template_instance = get_object_or_404(template_model, name=name, version=version)
@@ -72,11 +72,11 @@ def get_template_json_schema(request, template:str, name:str, version:str):
 # Allow everybody to GET our publicly available station group lookups
 @permission_classes([AllowAny])
 @authentication_classes([AllowAny])
-@swagger_auto_schema(method='GET',
+@swagger_auto_schema(#method='GET',
                      responses={200: 'A JSON object with two properties: group:<the_group_name>, stations:<the_list_of_stations>',
                                 404: 'No such group or template available'},
                      operation_description="Get a JSON list of stations for the given <station_group> name the the group definitions in the common_schema_template given by <template_name> and <template_version>")
-@api_view(['GET'])
+#@api_view(['GET'])  # todo: fix double url issue in urls.py, then use decorator here to include in Swagger
 def get_stations_in_group(request, template_name:str, template_version:str, station_group:str):
     station_schema_template = get_object_or_404(models.CommonSchemaTemplate, name=template_name, version=template_version)
     station_schema = station_schema_template.schema
diff --git a/SAS/TMSS/src/tmss/urls.py b/SAS/TMSS/src/tmss/urls.py
index 0439a2a181af2d27f78b5560aa3aeb99cd63223c..a97ef0a61de0392f08edcc2f25ab3c7f0f412e3f 100644
--- a/SAS/TMSS/src/tmss/urls.py
+++ b/SAS/TMSS/src/tmss/urls.py
@@ -62,8 +62,12 @@ urlpatterns = [
     re_path(r'^swagger(?P<format>\.json|\.yaml)$', swagger_schema_view.without_ui(cache_timeout=0), name='schema-json'),
     path('swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
     path('redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
-    re_path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'),  # !! optional trailing slash breaks reverse url lookup, two urls for same view break Swagger !!
-    re_path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>/?', views.get_stations_in_group, name='get_stations_in_group'),
+    #re_path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'),  # !! use of regex here breaks reverse url lookup
+    path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'),   # !! two urls for same view break Swagger, one url break json ref resolution !!
+    path('schemas/<str:template>/<str:name>/<str:version>/', views.get_template_json_schema, name='get_template_json_schema'),  # !! two urls for same view break Swagger, one url break json ref resolution !!
+    #re_path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>/?', views.get_stations_in_group, name='get_stations_in_group'), # !! use of regex here somehow breaks functionality (because parameters?) -> index page
+    path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>', views.get_stations_in_group, name='get_stations_in_group'),
+    path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>/', views.get_stations_in_group, name='get_stations_in_group'),
     re_path('util/sun_rise_and_set/?', views.get_sun_rise_and_set, name='get_sun_rise_and_set'),
     re_path('util/utc/?', views.utc, name="system-utc"),
     re_path('util/lst/?', views.lst, name="conversion-lst"),