Code review fixes
Finished up filter parameters and impl