Changed so form-single.@map attribute can be an expression