Improve category support
Update SQUAD/BoolSim page