Bug 12199 - [FR] add older behaviour when module name's given

Summary: [FR] add older behaviour when module name's given