Fixed issues with namevalue table