Fixed a bug in search (again)