fix bug with empty db - query
Merge remote-tracking branch 'origin/development' into development