Hotfix for field selection and updated single bill display