PIM-1644 Fix currency and metric filter resetting