Fixed the banner tracker. 

A new PR for #3518 and #3519 as they are out-dated.