Fix select fields