Bug fix: Selects right check out element
Merge branch 'develop' into feature/refresher