query as AA / phobos style applied / unittest coverage