aligned variable names - removed 'markup' (all pickers now expect key/label)