BOOK-673, fixing required fields