Fixes bugs with search test
Updated Version 3.3.005.009