Should be able to throw away some of the search controller stuff after Global Search is migrated (cherry picked from commit 0225711f6f91417af0ae41d42f81c70c86a572ab)
Should be able to throw away some of the search controller stuff after Global Search is migrated (cherry picked from commit 0225711f6f91417af0ae41d42f81c70c86a572ab)