Fix query type matching

Fix a typo introduced in b0af8fda5f701a3ba198f121b32e0852c842bd14 breaking the query type matching.
Remove old testing from Makefile, fix userspace location