Tweaked QuerySetMapper to return the value's value, in line with the changes to flexi...