Fix crash if since parameter value doesn't exist

Change-Id: I4c4955318eefe29135e4f4d5e2b278b1161238a4
Return more conformative json keywords

Change-Id: I1641086758b9fba5eb27497e38ca6b57ee3171d8