Removes translation of special characters again because iconv() doesn't work correctly in all cases
Improves implementation of catalog stage html client
Fixes basket and plugins so limits are correctly enforced