Improved filter in server side table #44