Changed search to only work with names