realted to issue #765 and a fix on Search model
Merge branch '765' into develop