Fix for search expansion