Added bracket and tag matching.