166,167c166,183
<       foreach($node->{$field['control_field_name']} as $value){
<          $current_values[] = $value['value'];
---
>       $content_taxonomy = false;
>       // gets all content_taxonomy fields
>       foreach(content_fields() as $content_field_name => $content_field_object) {
>         if(is_array(content_fields($field['control_field_name'], $machine_readable)) && ($content_field_object['type'] == 'content_taxonomy')) {
>           // we have a content_taxonomy field
>           $content_taxonomy = true;
>         }
>       }
>       if (!$content_taxonomy) {
>         foreach($node->{$field['control_field_name']} as $value){
>            $current_values[] = $value['value'];
>         }
>       }
>       else {
>         foreach($node->{$field['control_field_name']} as $value) {
>           $keys = array_keys($value);
>           $current_values = $keys[0];
>         }