Added empty fields detection
Added more tag editing