Cleanup: remove unused query
Add missing method
Update errorFragment for all possible error message output