Code cleanup and some warnings fixed.

Code cleanup and some warnings fixed.
#383753. Inserting of non-EN bucketable item

Inserting of non-EN bucketable item into a bucket switches content
language  - has been fixed.