merge fix (filterCondition crud was broken)