[OE-3107] mods to make use of default drug set