Fixed save to set ent.id to ent.id$ if present, fixed load to use q.id instead of qent.id or call list if q.id is not present