Return answer instead of null
Fix query detection
Remove more debug messages