Add provision and code inside screens

Add provision and code inside screens
Add APi for Search type 1
fix conflic