Add no watcher string + fix empty foreach