Improve fixes. Move expand to default.js