search module, some fixes