Qfix/no mask map

Ghost Userrequested to merge
qfix/no_mask_map into master

was making problems with creating new maps while following

Merge request reports