improved query
Merge branch 'datatable2'
time working correctly