REFACTOR tags mapping to be array