Added encoding on menu decorator