fix(tasks) - filter and order tasks

@petrjasek @ioanpocol feedback?