IDE-1230 switched back to specific service lookup