FIX : Remove duplicate query fn.