queries remade. hopefully no SQLi