CLS-924: multi table filtering working