TA3895 Updated search feature behaviour