Updated some extra WP params, and fiexed empty choices array