Removing Currency Filter Dependency