Fine tuning on "search range" method and files