lint issues
add some query interface helpers