Adds special treatment for only one entry in database.

Also removes the 'count' command, that I introduced earlier to
debug the wrong couting of entries.