data query gets labels too
use full names for x labels
fix tests after rebase