fixed sorting on filtering
fixed merge