fix query deletion and make a lot of fields final
bump version number