Also, can you look into these issues?https://docs.google.com/document/d/1MZsU7v4J9_0ZEvgxcwRUPJMNuG6l-bQe/
thanks will take a look, probably tomorrow