Fixes for filter & registration