Some improvement in search module and some changes to use the new version of semantic API