BUG-FIX When collection is no longer empty, empty template of collection should be cleared