Fixes to handling of cache bust query arg