Cleanup.
special case where results are inserted already
Merge branch 'master' into filtering-use