Fix import/export view

Some bugs introduce because I was tired surely ;)