Improve hints and allow multiple hints for a key