Fixes DEVELOPER-462

Currently going with the '*' (wildcard at the end) approach per Paul