Fixed map layers not working properly