Heatmap gene order issue.

In heatmap plot, 

For user-uploaded data, genes will be plotted in the same order if clustering is not performed. This is correct. 

While analysing public gene expression data if user uploads gene groups, order of the genes within each group should be the same as user-uploaded genes. Currently, within each group, genes are plotted in alphabetical order. 