Tighten up edmunds query logic

[Fixes #49632205]