Resolving property conflicts; adding Query.limit