Refactored executeQuery View