chimproved statemennt context filter query