Adding a null value filter in the tracker; Adding a new conflict variable for lights.