79318780 handle green trait

WIP: Please weigh in on this approach. Handling traits that come through as keys + a blank value. 

Also fixed a bad spec.
Down the road, would be nice to have a service object to handle all of the param conversion, so we can get all of this logic out of the model.