Fix duplicated query