Also split extension queries into their own functions https://bugzilla.gnome.org/show_bug.cgi?id=759538