Fix for wilcard searches