Solving conflicts and fixed rules that gave false positives on empty values.