Fixed filtering paramter names that changed during this refactoring