Ticket 1 - Fixed Service delete and sorting