added namespace check to picker.