Allow machine_names containing '-' and fix usage inside ajax

Code looks good.

I think we should add a custom error message though - if one uses a invalid slot-id currently the message reads:

The machine-readable name must contain only lowercase letters, numbers, and underscores.

Which is not correct because we allow "-" too

Automatically closed - issue fixed for 2 weeks with no activity.