Cleaning up tagSelector behavior