2 bugfixes for selectors: units, task units