bugfixes:
    - refactored into function and use in some action plugins to match actual module used, made precedence very clear in code.
