Fix filtering keys
Merge branch 'develop' of github.com:PDI-DGS-Protolab/Reporting into develop