Revert "Tighten up edmunds query logic"

This reverts commit 074287634661504fa3f5f0449f0f029302fea67f.
Tighten up Edmunds query logic

[Finishes #49632205]