Fix WherePart scope