Fixed issues on the demographics edit pages