SSP-2019 Fixed issue with limit set to arbitrary value, fixed issue with fields throwing exceptions