fixes
add smarter search scopes