updated analyzer and queries