code cleanup and search config added
merge conflicts fixed