Merge branch 'area-query-tweak' into 'master'

Area query builder: Make internal peer list finder an attribute.

I realized using the memoize functionality was kind of silly for managing what is essentially an attribute.

See merge request !2