Making 'include UID only' option mandatory