[CHANGE] include more hosttags;