Broken search refactor. This commit is a mistake; thought I was committing oetg-v