diff --git a/inventory_provider/gap.py b/inventory_provider/gap.py
index 2f728c31caca91b4f835a8950ac5b36a89aa1b39..bd91ea5f1c5d455979cada418a1544321d51f489 100644
--- a/inventory_provider/gap.py
+++ b/inventory_provider/gap.py
@@ -43,8 +43,8 @@ def make_request(body: dict) -> dict:
 def extract_router_info(device: dict) -> dict or None:
     tag_to_key_map = {
         "RTR": "router",
-        "OFFICE_ROUTER": "office_router",
-        "Super_POP_SWITCH": "super_pop_switch"
+        "OFFICE_ROUTER": "officeRouter",
+        "Super_POP_SWITCH": "superPopSwitch"
     }
 
     tag = device.get("product", {}).get("tag")
@@ -95,7 +95,8 @@ def load_routers_from_orchestrator() -> dict:
     query = """
     {
         subscriptions(
-            filterBy: {field: "status", value: "ACTIVE"},
+            filterBy: {field: "status", value: "PROVISIONING|ACTIVE"},
+            first: 500,
             query: "tag:(RTR|OFFICE_ROUTER|Super_POP_SWITCH)"
         ) {
             page {