Revert "[BROKEN COMMIT] Current work on Tag filtering"

This reverts commit f652df5248d53b777cd39aabf5dc52ca7bc1c7a2.