Added support for narrowing search