Tags are now only passed if not empty