Added workaround for searching