Getting tags working ... correctly this time