[TASK] Refactor looping of overlays
[TASK] Reverse order of boolean comparisons