Fixes basket and plugins so limits are correctly enforced, reverts iconv() for trailing names in URLs