custom search module
merge conflicts