Fixed displaying all when nothing is selected