Replaced orderByName with better filter for future sorting support.
Hurray! Sorting for all!