Better context tag matching