Force legacy names for legacy search
Fix comment in legacy search spec