some bugfixes + search wgt