Trying to fix bug in metric filters in Data Service