FIX: query-results tab changes
FIX: data_value edit / admin menu always there
Merge branch 'master' into working