option to disable global state select, to filter by state
some small inprovements