Add autogenerated queries for simple VO's