Adding manual reading submit option back, empty data fix