Changes to bottlepopper and the query