Added orderBy 'name' for better sorting