Multiple changes to osctrl-api: Crash fix, show carve queries and better targets to list queries#554