modified for search module