Disabling and enhancing returned entity fields