label enhancements and switched to using the latest filters