fixed map bug, tested for presence of elements before trying to check the checkbox
Merge branch 'master' into bug_fix