Added internal search
Added fixes, echo'ing in between result echo's