Fix: Fix the check for including notes and overrides in results (backport #2305)

Fix: Fix the check for including notes and overrides in results (backport #2305) #2191