Fixed handling of < and > keys