MNore work on search module