Added some wildcard constraints to properly incorporate read data

Tizian Schulz requested to merge dev into master

Merge request reports