More fixes to the auto select generation on Admin form