Custom select fields wrapped correctly