Add ProfileSet / ProfileFilter, fix orders