[BUGFIX] Prevent duplicate workspace query filter