More ParseQuery registrations

Registrations and bug fixes