Ticket #2971: fixing the remaining bugs in the ticket (hopefully)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@23282 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e