Improve tagging

- add command line arguments
- improved key: value tags

Signed-off-by: Vlad <vg@vladgh.com>
Improve tagging