Search fixes

https://github.com/opencart/opencart/commit/43dde3a7736758dfdb1d0b725e4e25ae4dc1b797
and

https://github.com/opencart/opencart/commit/259e11b3bb25a0aef6c75f60e18d53058519a60e
and

https://github.com/opencart/opencart/commit/dd9ad783021e4348d74aff816862e05e8838bdfd