Fixed trashed files fetching, fixed file types queries