Bug with close button
Extend close button to deal with tags