[#46][#48] Fixed scopes and search method