prevent deploy hang
refactoring back to json+html