Supporting queries with 'fill(number)'