using static import for queries now
merge master