Filtering improvements, No results text and few UI improvements