Fix options on entities