Better handling for starred items