Added separate aguments, corrected some display problem, removed the
prompt (search now passed as argument)