search works
Merge branch 'rsearch'