v1.2.3 with refactored scan search code