added card4wap condition
changed placeholder expansion to be in units degrees vis angle