refactoring
tab should always advance from name to value
small fix