Add configuration to swith search method
Remove warnings