Fix: Panic due to concurrent map r/w

Fix: Panic due to concurrent map r/w. The Marshall function can read from referenced maps, at the same time one can update the activty/query stats. This MR uses the existing lock to avoid concurrent map read/write.