Partial implementation of new filtering. Changed launch logic on finding script to execute for test