Merge branches 'version3' and 'test12' into version3
add rest of search positions