some tweaks (now, context is filled at runtime, not stored into
database)