Json issues resolved