S3Map brought into line with S3Search. Fixes for S3Report show/hidden report options