Added Item and Module as search criteria. Have not fully tested search.
-ININ.