added standard search, refactored search related modules and fixed bugs