Fixed severe bug in picklists