BP-732 changed query for better performance
3 files changed