This filter method is called at many place, is there not a way to make DRY it up and only call it once ?