Added counter and numeric queries