CAL-861 parsing limit and fix some small bug on rest api