Bug fixed with Adding template and Search