divided source and editor collection again (fetch and display differ too much), fixed serialization