Refactor prediction filtering process in supertx Change-Id: Id2ca1c1b03fc6dca33e86cdbc17ca0782f44a446