Fixed remove tags issue
Merge branch 'kostas'