Updated suggestion model

The suggestion model components now match what the endpoint will
return.  Also fixes @@ bug.