diff --git a/etc/api/shared.yaml b/etc/api/shared.yaml
index 8635b04f76..f9272d5f3c 100644
--- a/etc/api/shared.yaml
+++ b/etc/api/shared.yaml
@@ -19,7 +19,7 @@ api:
     - civicinfo # no oauth2
     - webmasters # no oauth2
     - doubleclickbidmanager # no oauth2
-    - freebase # ERROR
+    - freebase # no oauth2
     - spectrum # no oauth2
     - qpxexpress # no oauth2
     - discovery # no oauth2
diff --git a/src/mako/lib/lib.mako b/src/mako/lib/lib.mako
index f7d0342a2f..7a45f3ef65 100644
--- a/src/mako/lib/lib.mako
+++ b/src/mako/lib/lib.mako
@@ -12,7 +12,11 @@
     # fr == fattest resource, the fatter, the more important, right ?
     fr = None
     if schemas:
-        fr = sorted(schemas.values(), key=lambda s: (len(c.sta_map.get(s.id, [])), len(s.get('properties', []))), reverse=True)[0]
+        for candidate in sorted(schemas.values(), key=lambda s: (len(c.sta_map.get(s.id, [])), len(s.get('properties', []))), reverse=True):
+            if candidate.id in c.sta_map:
+                fr = candidate
+                break
+        # end for each candidate to check
 %>\
 # Features