Separate the search field from the actual data field [RTFACT-17827]