Fix for collection finding all records