Display errors only if needed
Add sort