doc and setSearch refactoring
Merge branch 'feature-next' into develop