after filter order fixes
Merge branch 'master' of https://github.com/ndevrstudios/concerto