Fixed bug in pick list query