Ticket #3953: workaround until better solution (problem caused by r30844 in ticket #3767)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@30862 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Ticket #3886: doing what was asked (more special cases for Mike, refactoring for Zbynek)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@30863 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Ticket #3886: error in my previous commit

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