PIM-2184 : move constant to query utility