Updates to filtering and rescorer