Make empty grid text while filtering include the filter value

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Small fixes

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>