Add JsonEntry expression, Fixed bugs