Get topic document matching working again