Search: fix any release-blocking breakage found by integration tests

Created by: ijt

This is part of #1005 (closed) .