Added right arrow. Handle null Json
Fixed some variable names