Fixed the search bug
Cleanup after fixing search bug
Merge branch 'master' of https://github.com/aimers1975/APTAmySadafConnexusssar

Merging latest with the search bug fix