Fixed merge
BASIC-795: removed no results text