Rework do-query to use database for special case