Security fixes
Fixed search issue