Revert "Special case all search here"

This reverts commit 433ce14da0b00f2a0d44f6751ce9c4f482a00da2.
Revert "Do not handle fallback here, it should not happen"

This reverts commit fc8bcfccb9d264834e6ca85f155eb3952962dd5f.