devquery: add remaining helper functions + add info units