use new search scopes
simplify if statements a bit