Use account id in ui queries; support account query

Change-Id: Ic9a18a8eb416d885f3cb09d59680499d5743c914
1 file changed