Bit off a bit more than I can chew - reverting some changes
filter by topic works now