Fixing default banner select logic
Merge branch 'develop'