[changed] several fixes and search revision