Database service resolver fixed