Fixed Tags in the new Client