CORE-738 - select query updated