Cleaned faster query