Handle when column name wildcard is prefixed by table name

Handle when column name wildcard is prefixed by table name #536