new states & fix for pagination