Fix the picker to work with turbolink