v5

Improve DB select