Update filter comments and filter callback to reduce compares. Tested.