Added string interpolation in DB queries