Add index query to bucket, still needs testing though