Add two more statistical summary based judge indicators
Reorder search helper methods