Fix include/exclude tags - fixes #487