Bug 15524: (RM follow-up) Fix calls and add filter