Quick patch for finding via Bucket ID in query string