Story Tag: improve performance