Eager select: more general fix for data preselect