For now bypassing the fancy query access code.