Bugfix for searching