add USE_WORK_NOW and SUBSTITUTABLE_DEFAULT to settings
and use where needed