modified to implement storage tag for auto select