Fix database pooling issues
Optimize map request queries