Запрос не всегда корректно работает. Как исправить?

CREATE TABLE dbo.DataTable
    (
    CityId uniqueidentifier NOT NULL,
    CompanyId uniqueidentifier NOT NULL,
    ChangedOn datetime NOT NULL,
    ParamType uniqueidentifier NOT NULL,
    ParamLastValue uniqueidentifier NULL,
    ParamNewValue uniqueidentifier NULL
    )  ON [PRIMARY]
GO
 
CREATE TABLE dbo.FilterTable
    (
    CityId uniqueidentifier NOT NULL,
    Param1 uniqueidentifier NULL,
    Param2 uniqueidentifier NULL,
    Param3 uniqueidentifier NULL
    )  ON [PRIMARY]
GO

SELECT TOP 1 WITH TIES
    CompanyId
FROM DataTable dt 
    INNER JOIN FilterTable ft ON ft.CityId = dt.CityId
    INNER JOIN DataTable dt1 ON dt1.CityId = dt.CityId AND dt1.ParamType = Type1
    INNER JOIN DataTable dt2 ON dt2.CityId = dt.CityId AND dt1.ParamType = Type2
    INNER JOIN DataTable dt3 ON dt3.CityId = dt.CityId AND dt1.ParamType = Type3
WHERE
    dt1.ParamNewValue = ft.Param1
    AND dt2.ParamNewValue = ft.Param2
    AND dt3.ParamNewValue = ft.Param3
ORDER BY ROW_NUMBER() OVER(PARTITION CompanyId, dt1.ParamType, dt2.ParamType, dt3.ParamType 
                           ORDER BY dt1.ChangedOn DESC, dt2.ChangedOn DESC, dt3.ChangedOn DESC)