Fixed issues with non-spatial analysis