Fix locking issue in gatways map database implementation

It's not clear why we are using sublocks here as it should not be necessary. I left those alone and instead used the locks in a more appropriate and threadsafe manner.