Improved performance market filtering, increased market window selection and number