Fix selective save for manually serializable entities