Fixed issue with data uri logging
Merge branch 'filter' into featuremerge