Fixed storing the correct line number (MP2-371)
Fixed storing of "HasFocus", on screen changes the property was cleared before storing it (MP2-371)