Better json loading
filtering optim
continue on json loading refactor