add query to packages instead of lib