Replaced own 'orderByKey' filter with built in 'orderBy' filter