Refactor to central filterPack service for better performance