Fixes, added literal and begins_with comparison
Handle empty keys gracefully