Bugfixes on stage filtering/selection