fix subqueries, update rockspec