added ability for substitute aliases when mapping is on single line