COMMONS-190: Unified search feature - fix offset error