Make modifier Id unique per modfier

[bogadisa]

Modifier id is unique per row instead of per modifier. This makes it annoying to deal with in the frontend and for #809.