2.2.8: Fix two issues, added searchScope