Fix Tag and Program model references