label enhancements and switched to using the latest filters
Merge branch 'walport-water' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing