base

Make suggestions handle string or int

Evidently metadata bundles turn a single int into an integer rather than a
string without telling you.

Change-Id: I5c6557bad51981f27a7e213052e2be5bcc3a0a93