Spec and fix for search