Improved on demand logic, remember on demand options, increased usage data list, update changelog