Add services filtering if no images avaliable

Change-Id: I9018420d50618bce183e7d46c03298758404cd6e