Ordering + corrected source of sql import