Additional work on the unified search