Fix up locked filter behaviour. Add bindings.