Fixes Codex Search Issue #5