Fix sorting in most places
prevent create/delete of SOA