Rename properties and cleanup
Add ability to detect list presence in query results