refactor hash list to allow tags

Change-Id: Ia70a82c9e7b484f9f74d55ec59f2beeff4f49726