fix issue with unique names and prefilter/use result etc. inconsistency
Merge branch 'master' into saiku3