Fix partly #169 (Make attribute selection optional, if attributes available)