added "add choice" functionality and filtering