Add filter and changed order of presentaion