Added database Id in saved user query