fix some display bugs, related to Account Id