Bug fix select fields