Fixes DEVELOPER-462

Currently going with the '*' (wildcard at the end) approach per Paul
If we're good with using the suggestions API approach (that thread is starting to get out of hand) I'll remove it. I left it in simply to see the differences between the two.