wip
wip with dropdownfilter rework
updated unit tests