Make search paths follow 5.2 semantics

Signed-off-by: katlogic <git@git.git>