Small tweaks to revert back on old isLoading controller properties until promise-tracker working