changes to tuple map selectors