replaced name with label, so the full state name will show instead of abbreviation
updated tap functions, for both with/without links