Fix stuff
Fix migration issue
fix json rendering