Fix matching issue with definition tags