Improved ViewPropertySelector handling