hopefully fixing some issues with small queries