Hide Empty Car Directories

Hi

Is it possible to hide empty categories on the Car Dealer theme. There are for examples “Makes” and “Models”

1. I need to design a site for a single (personal) car dealer, but say for instance they only have a few cars and models they don’t want every make and model displayed on the search function because people will search for cars they don’t have. Can it somewhere be set to only list “Make” and “Models” that has a car connected to it and hiding the empty ones. Please see attachment “Empty Categories”.
2. When I edit a listing and want to change the “Display Image” it opens a new empty tab.

Thank you.
Francois