Fix the non-standard subs map
Merge pull request #962 from kbidarkar/fix-manifest-non-standard

Fix the non-standard subs map