adding option for tags as well