some escaping tests added and little cleanup
checkbox field implemented