Fixes for Broken Map after restart + Static Db tryout