Possible fix for search bug?