CON-118: Prevent changing language after filtering