Enhancements to throttle detection and saving of params