Update on custom query builder