GV-865 - Order by first name, last name and added shipping type field to grid