Preliminary version of topic selection/filtering
Quick fixes