Improve selection of user instances [MJ-212]