Changed location where map layer name is read from

so that webmap version of name is used rather than original layer name
Merge branch 'fix_layer_names_in_filter_edit_display' into develop