Add caps filter, implements #4