Added range filtering