CORE: Minor improvements + data provider filter bugfix
CORE: Minor improvements + data provider filter bugfix

ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools,ubtue/ub_tools