Resolved select and select-properties migration issues, fourth iteration