diff --git a/chaincode/fabcar/external/fabcar.go b/chaincode/fabcar/external/fabcar.go
index f6c30656..c48211d5 100644
--- a/chaincode/fabcar/external/fabcar.go
+++ b/chaincode/fabcar/external/fabcar.go
@@ -7,16 +7,16 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 	"os"
+	"strconv"
 
 	"github.com/hyperledger/fabric-chaincode-go/shim"
 	"github.com/hyperledger/fabric-contract-api-go/contractapi"
 )
 
 type ServerConfig struct {
-	CCID     string
-	Address  string
+	CCID    string
+	Address string
 }
 
 // SmartContract provides functions for managing a car
@@ -99,8 +99,8 @@ func (s *SmartContract) QueryCar(ctx contractapi.TransactionContextInterface, ca
 
 // QueryAllCars returns all cars found in world state
 func (s *SmartContract) QueryAllCars(ctx contractapi.TransactionContextInterface) ([]QueryResult, error) {
-	startKey := "CAR0"
-	endKey := "CAR99"
+	startKey := ""
+	endKey := ""
 
 	resultsIterator, err := ctx.GetStub().GetStateByRange(startKey, endKey)
 
@@ -158,13 +158,13 @@ func main() {
 	}
 
 	server := &shim.ChaincodeServer{
-					CCID: config.CCID,
-					Address: config.Address,
-					CC: chaincode,
-					TLSProps: shim.TLSProperties{
-							Disabled: true,
-					},
-			}
+		CCID:    config.CCID,
+		Address: config.Address,
+		CC:      chaincode,
+		TLSProps: shim.TLSProperties{
+			Disabled: true,
+		},
+	}
 
 	if err := server.Start(); err != nil {
 		fmt.Printf("Error starting fabcar chaincode: %s", err.Error())
diff --git a/chaincode/fabcar/go/fabcar.go b/chaincode/fabcar/go/fabcar.go
index ae3e5264..fbb66070 100644
--- a/chaincode/fabcar/go/fabcar.go
+++ b/chaincode/fabcar/go/fabcar.go
@@ -92,8 +92,8 @@ func (s *SmartContract) QueryCar(ctx contractapi.TransactionContextInterface, ca
 
 // QueryAllCars returns all cars found in world state
 func (s *SmartContract) QueryAllCars(ctx contractapi.TransactionContextInterface) ([]QueryResult, error) {
-	startKey := "CAR0"
-	endKey := "CAR99"
+	startKey := ""
+	endKey := ""
 
 	resultsIterator, err := ctx.GetStub().GetStateByRange(startKey, endKey)
 
diff --git a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java
index b267d801..6066765d 100644
--- a/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java
+++ b/chaincode/fabcar/java/src/main/java/org/hyperledger/fabric/samples/fabcar/FabCar.java
@@ -134,7 +134,7 @@ public final class FabCar implements ContractInterface {
     }
 
     /**
-     * Retrieves every car between CAR0 and CAR999 from the ledger.
+     * Retrieves all cars from the ledger.
      *
      * @param ctx the transaction context
      * @return array of Cars found on the ledger
@@ -143,8 +143,8 @@ public final class FabCar implements ContractInterface {
     public CarQueryResult[] queryAllCars(final Context ctx) {
         ChaincodeStub stub = ctx.getStub();
 
-        final String startKey = "CAR0";
-        final String endKey = "CAR999";
+        final String startKey = "";
+        final String endKey = "";
         List<CarQueryResult> queryResults = new ArrayList<CarQueryResult>();
 
         QueryResultsIterator<KeyValue> results = stub.getStateByRange(startKey, endKey);
diff --git a/chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java b/chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java
index b52465e7..a1066a08 100644
--- a/chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java
+++ b/chaincode/fabcar/java/src/test/java/org/hyperledger/fabric/samples/fabcar/FabCarTest.java
@@ -211,7 +211,7 @@ public final class FabCarTest {
         Context ctx = mock(Context.class);
         ChaincodeStub stub = mock(ChaincodeStub.class);
         when(ctx.getStub()).thenReturn(stub);
-        when(stub.getStateByRange("CAR0", "CAR999")).thenReturn(new MockCarResultsIterator());
+        when(stub.getStateByRange("", "")).thenReturn(new MockCarResultsIterator());
 
         CarQueryResult[] cars = contract.queryAllCars(ctx);
 
diff --git a/chaincode/fabcar/javascript/lib/fabcar.js b/chaincode/fabcar/javascript/lib/fabcar.js
index 14425b77..1220e5f0 100644
--- a/chaincode/fabcar/javascript/lib/fabcar.js
+++ b/chaincode/fabcar/javascript/lib/fabcar.js
@@ -108,8 +108,8 @@ class FabCar extends Contract {
     }
 
     async queryAllCars(ctx) {
-        const startKey = 'CAR0';
-        const endKey = 'CAR999';
+        const startKey = '';
+        const endKey = '';
         const allResults = [];
         for await (const {key, value} of ctx.stub.getStateByRange(startKey, endKey)) {
             const strValue = Buffer.from(value).toString('utf8');
diff --git a/chaincode/fabcar/typescript/src/fabcar.ts b/chaincode/fabcar/typescript/src/fabcar.ts
index 2f45f9ef..597da7e2 100644
--- a/chaincode/fabcar/typescript/src/fabcar.ts
+++ b/chaincode/fabcar/typescript/src/fabcar.ts
@@ -105,8 +105,8 @@ export class FabCar extends Contract {
     }
 
     public async queryAllCars(ctx: Context): Promise<string> {
-        const startKey = 'CAR0';
-        const endKey = 'CAR999';
+        const startKey = '';
+        const endKey = '';
         const allResults = [];
         for await (const {key, value} of ctx.stub.getStateByRange(startKey, endKey)) {
             const strValue = Buffer.from(value).toString('utf8');