Systematized handling of manifestations
More fields made optional in the construct query