fix filtro fileid, intensive refacotring