Add/remove contract functionality missing #16
Added filtering to the available choices and make sure update
adds/removes the user selected choice