Other half of fix for variable number of columns

Parse variable number of fields returned by keystone