* Added some Search related fixes on lower OS versions