Tag: improve ergonomics