Ugly queries removed to Controller