Hi guys finally I've completed units fixup and terrain counts for each scenario (official ones).
Thanks to Sean and Michael for helping me in moving scenarios in to the correct Map Category.
If you find some errors, please report them in the forum so that I can fix it.