Work on encounter form bug fixes.