482 sort mappings by source logic

Shall fix #482.