Working on customizing query.