setup-queries now handling px values