Move filter into adaptor

Now can specify uid, filter and nameproc