Mysql tagging

Merged with master and fixed tests