a few more tweaks to add db names to the trigger