Re-order features for better rendering