fixed order and added filter