Apply metric filtering when adding and removing metrics instead of in the collect method

Apply metric filtering when adding and removing metrics instead of in the collect method #111