fixed sorting on filter
fixed merge