Store tags moved to previous logic