More function comments.
Renamed $query to $efq to avoid confusion with Serchilo queries.
Shortcut add/edit: Prevent keyword collisions, close #33.