fixes for regex in tag matching