Fix Bugs to send correct JSON