Big bug fixed on tags save