Make keyhunt cap based (note: may break some maps)