Did this cause I'm not quite happy with the litterals from the API and was turning them to the names that we have in the UX spec.

But I think your approach is more correct, will remove the mappins and use the same, we will need to be careful with some states (like 'removed') to filter them.