#136 proper handling of two pass and all properties and their escaped variants