v0.6.4 Tighten security around populate and select