* FIX : Entity selector fixes for WIA