Added add_option_data field to better manage the data attribute and fixed attaching taxonomy terms from multiple taxonomy fields