Fix typo
:lipstick: More refactoring, adding tags support
Small fixes