Added Options "StateSave" and "Language"

I hope this works as "Fix for pagination not working" is still included