Advertisement changed to Entity
Merge branch 'master'
Switch case bracket fixed