fixed filters and calculations