Partial search bugfix