#MLHR-669 Fix json format bug and improve the woop