WP-959, WP-960, WP-626: spotlight field order and changes.