Restored fix for normalize to properly handle implicit WHERE clause