Added d json file extensions
Fixed limit/offset bug