Quick and ugly fix
Improved json views