Adapt to new DB structure

hmm. I don't really agree with this.

It should be catalog that should fitler based on this attribute...not topic.