Make tag combiner more simple in dev-build