Improved sapi="xyz" constraint