Remove cookie link
Adding more types
Streamline input-ids