yotam: fix bug in displaying search string, and some indentation problems