Various fixes related to layer display on map composer