Revert "Revert "Markers display using data on device""

This reverts commit 47fd71a39b0708e4e62fd80410d5000348bd8822.
Bug fixes on map