made query syntax more fluent