Added tags expansion to hosts and fixed some typos