A few small changes

Some of them should be ported upstream (in ConTeXt)

I'm now trying to figure out how to make the file:xxx syntax look in the database instead of just looking for the file in the filesystem... I have to say it's extremely difficult to debug ConTeXt code! A side effect of the numerous locals everywhere that obfuscate the true name of the functions...