Made current pick default selection Refs #39