Feature/filter markup rebase