minor fixes
remove duplicate maps inside a sub-condition