- Cleaning up + extending services interface
- Filter validation patching