Revert "Fixes for setTags() and empty tags"

This reverts commit ce0414a547ddd9ab97ad8bde717d3e7bc5505551.
Revert "ADD: pass additional parameter to taggedWith() which allows matching ANY"

This reverts commit e06b34f576e2eb8d7c867bd7c7828736acee0ad0.