clean tag parameters

Change-Id: I9ac029dbafbf10789bdb3a763d297cf7c8abe4c1