[#33676] Improve DB Query Code quality in Content<->Contact plugin (Fix #3537)