Corrected another bug in passing of parameter to a Query (i++)
Added Tag class