fix: Properly escape some intermediate values before querying them
add: Mark upstream remote in yellow if branch name differs on remote