Fix string/colname ambiguity and add initial support for multi-row colnames