Better tag matching.

closes #58