Don't check for windows where we already know that the check shouldn't be returned due to the non-matching entity / check
Switch to map and case