added fixes for json validation