Moved to custom query builder and more preparations for Aura2.