added option to not include tags