better logic in dropdown given new derby features