Some minor fixes, code cleanup
Finished feature 60403452/include-exclude-tags.