Correct empty search routing
Extend functional tests for search