final data/query commit

:accept: :+1: