Add more mappings; fix bug on Bugzilla form post.