Refactor empty message and fix collection refilling bug
Update bower.json