BP-732 remove double database requests
5 files changed