clean up filtering, and int mappings between pack pane & master