Fixed filtering by tags

Strings starting with a hyphen are not handled as expected by the argument parser, so use underscores instead, and then convert them to hyphens.