Some of the functionality here needs some re-factoring and centralization as we introduce it in to more places, but I'll make this change here and in the systems controller.