Switch to more generic ranking approach for use in all polls