Add firstaid/bhv fields to display and whitelist