Updated area query