Catagory and datasource filter is now executed by database