Don't call legalSearchChars() statically so it can properly inherit

Change-Id: Iaabc10ce2905eefe9de8bceeec3290082ba9eb2e
Merge "Don't call legalSearchChars() statically so it can properly inherit"