FORUM-84 | Unified Search connector implementation - build URI improvement(cont)