VE-1125: Greatly updated selector list