i) fixed tags definition of namespace local variables
ii) changed tags to <@ @> and <& &>
Finished feature, closes #5