branch: move 'current' check down to the presentation layer