Modified custom queries for trailblocks.

Also killed off the Australia front switch.

@janua cloud you take a look please