queries are more explicit, with dimensions added (or implied).
moved 2 queries to under characteristic + entity (nearly all queries will have an OBOE entity)
fixed some typos in the 5 scenarios.