adding filtering and choice selection