fixed some picker related bugs