Removed confusing double setting
Added missing locale middleware