Added option for tag expressions